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

fix wrong path handling in reconcile_with_remote, refine spans

Browse Source
This commit is contained in:
Dmitry Rodionov
2022-11-11 16:25:10 +02:00
parent c631fa1f50
commit c9188ffa67
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pageserver/src/tenant.rs
View File

@@ -545,6 +545,7 @@ impl Tenant {
Ok(())
}
#[instrument(skip(self, index_part, remote_storage), fields(timeline_id=%timeline_id))]
async fn load_remote_timeline(
&self,
timeline_id: TimelineId,
@@ -785,7 +786,7 @@ impl Tenant {
/// Subroutine of `load_tenant`, to load an individual timeline
///
/// NB: The parent is assumed to be already loaded!
#[instrument(skip(self, metadata), fields(tenant_id=%self.tenant_id, timeline_id=%timeline_id))]
#[instrument(skip(self, metadata), fields(timeline_id=%timeline_id))]
async fn load_local_timeline(
&self,
timeline_id: TimelineId,

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

@@ -1130,7 +1130,7 @@ impl Timeline {
/// The caller can provide IndexPart if it has it already. If it's None,
/// this function will download it.
///
#[instrument(skip(self, index_part), fields(timeline_id = %self.timeline_id))]
#[instrument(skip(self, index_part, local_metadata, first_save))]
pub async fn reconcile_with_remote(
&self,
local_metadata: TimelineMetadata,
@@ -1183,10 +1183,15 @@ impl Timeline {
// TODO what to do with physical size?
// Are there local files that don't exist remotely? Schedule uploads for them
let timeline_path = self.conf.timeline_path(&self.timeline_id, &self.tenant_id);
for fname in &local_only_filenames {
let sz = fname.metadata()?.len();
let absolute = timeline_path.join(fname);
let sz = absolute
.metadata()
.with_context(|| format!("failed to get file {} metadata", fname.display()))?
.len();
info!("scheduling {} for upload", fname.display());
remote_client.schedule_layer_file_upload(fname, &LayerFileMetadata::new(sz))?;
remote_client.schedule_layer_file_upload(&absolute, &LayerFileMetadata::new(sz))?;
}
if !local_only_filenames.is_empty() {
// FIXME this we should merge local and remote metadata, at least remote_consistent_lsn