Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

on "debug reindex" failed, report operation id containing missing commits #2751

Merged
merged 6 commits into from
Dec 29, 2023
Merged

on "debug reindex" failed, report operation id containing missing commits #2751

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3d4a806
clenaup: don't use debug format to embed ObjectId in error message
yuja Dec 28, 2023
3051d89
repo: add error propagation path to IndexStore initialization and loa…
yuja Dec 17, 2023
1237f0b
index: propagate DefaultIndexStore::init/reinit() errors
yuja Dec 17, 2023
8606bb2
index: rename private index_at_operation methods, reorder arguments
yuja Dec 28, 2023
8009205
index: add explicit reindexing method that can propagate error
yuja Dec 27, 2023
8855bc2
index: show bad operation id if commit lookup failed during reindexing
yuja Dec 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions lib/src/default_index/store.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ impl DefaultIndexStore {
Ok(())
}

fn load_index_at_operation(
fn load_index_segments_at_operation(
&self,
op_id: &OperationId,
commit_id_length: usize,
change_id_length: usize,
op_id: &OperationId,
) -> Result<Arc<ReadonlyIndexSegment>, DefaultIndexStoreError> {
let op_id_file = self.dir.join("operations").join(op_id.hex());
let index_file_id_hex =
Expand All @@ -120,10 +120,10 @@ impl DefaultIndexStore {
}

#[tracing::instrument(skip(self, store))]
fn index_at_operation(
fn build_index_segments_at_operation(
yuja marked this conversation as resolved.
Show resolved Hide resolved
&self,
store: &Arc<Store>,
operation: &Operation,
store: &Arc<Store>,
) -> Result<Arc<ReadonlyIndexSegment>, DefaultIndexStoreError> {
let view = operation.view()?;
let operations_dir = self.dir.join("operations");
Expand Down Expand Up @@ -157,10 +157,10 @@ impl DefaultIndexStore {
mutable_index = DefaultMutableIndex::full(commit_id_length, change_id_length);
}
Some(parent_op_id) => {
let parent_file = self.load_index_at_operation(
let parent_file = self.load_index_segments_at_operation(
&parent_op_id,
commit_id_length,
change_id_length,
&parent_op_id,
)?;
maybe_parent_file = Some(parent_file.clone());
mutable_index = DefaultMutableIndex::incremental(parent_file)
Expand Down Expand Up @@ -259,23 +259,23 @@ impl IndexStore for DefaultIndexStore {
let op_id_hex = op.id().hex();
let op_id_file = self.dir.join("operations").join(op_id_hex);
let index_segment = if op_id_file.exists() {
match self.load_index_at_operation(
match self.load_index_segments_at_operation(
op.id(),
store.commit_id_length(),
store.change_id_length(),
op.id(),
) {
Err(DefaultIndexStoreError::LoadIndex(err)) if err.is_corrupt_or_not_found() => {
// If the index was corrupt (maybe it was written in a different format),
// we just reindex.
// TODO: Move this message to a callback or something.
println!("The index was corrupt (maybe the format has changed). Reindexing...");
self.reinit().map_err(|err| IndexReadError(err.into()))?;
self.index_at_operation(store, op)
self.build_index_segments_at_operation(op, store)
}
result => result,
}
} else {
self.index_at_operation(store, op)
self.build_index_segments_at_operation(op, store)
}
.map_err(|err| IndexReadError(err.into()))?;
Ok(Box::new(DefaultReadonlyIndex::from_segment(index_segment)))
Expand Down