rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-05-31 12:00:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

timeline: remove GenericRemoteStorage exposure

Browse Source
This commit is contained in:
Joonas Koivunen
2023-08-21 09:44:37 +03:00
parent 52eaa52573
commit 0fd14ad74b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pageserver/src/tenant/timeline.rs
View File

@@ -15,7 +15,6 @@ use pageserver_api::models::{
DownloadRemoteLayersTaskInfo, DownloadRemoteLayersTaskSpawnRequest, LayerMapInfo,
LayerResidenceEventReason, LayerResidenceStatus, TimelineState,
};
use remote_storage::GenericRemoteStorage;
use serde_with::serde_as;
use storage_broker::BrokerClientChannel;
use tokio::sync::{oneshot, watch, TryAcquireError};
@@ -1012,7 +1011,7 @@ impl Timeline {
.as_ref()
.context("timeline must have RemoteTimelineClient")?;
self.evict_layer_batch(remote_client, layers_to_evict, &cancel)
self.evict_layer_batch(remote_client, layers_to_evict, cancel)
.await
}
@@ -1063,10 +1062,11 @@ impl Timeline {
let mut js = tokio::task::JoinSet::new();
for (i, l) in layers_to_evict.into_iter().enumerate() {
for (i, l) in layers_to_evict.iter().enumerate() {
js.spawn({
let l = l.to_owned();
async move { (i, l.evict_and_wait().await) }
let remote_client = remote_client.clone();
async move { (i, l.evict_and_wait(&remote_client).await) }
});
}