Skip to content

fix(drive): eliminate panic in grovedb operations logging under concurrent execution #3142

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

Open
thepastaclaw wants to merge 1 commit into
base: v3.1-dev
Choose a base branch
from
+52 −40
Open

fix(drive): eliminate panic in grovedb operations logging under concurrent execution #3142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 26 additions & 20 deletions packages/rs-drive/src/util/grove_operations/grove_apply_batch_with_add_costs/v0/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,26 +84,32 @@ impl Drive {
);

#[cfg(feature = "grovedb_operations_logging")]
if tracing::event_enabled!(target: "drive_grovedb_operations", tracing::Level::TRACE)
&& cost_context.value.is_ok()
{
let root_hash = self
.grove
.root_hash(transaction, &drive_version.grove_version)
.unwrap()
.map_err(Error::from)?;

let (ops, previous_root_hash) =
maybe_params_for_logs.expect("log params should be set above");

tracing::trace!(
target: "drive_grovedb_operations",
?ops,
?root_hash,
?previous_root_hash,
is_transactional = transaction.is_some(),
"grovedb batch applied",
);
if let Some((ops, previous_root_hash)) = maybe_params_for_logs {
if cost_context.value.is_ok() {
match self
.grove
.root_hash(transaction, &drive_version.grove_version)
.unwrap()
{
Ok(root_hash) => {
tracing::trace!(
target: "drive_grovedb_operations",
?ops,
?root_hash,
?previous_root_hash,
is_transactional = transaction.is_some(),
"grovedb batch applied",
);
}
Err(e) => {
tracing::warn!(
target: "drive_grovedb_operations",
error = ?e,
"failed to get root hash for post-batch logging",
);
}
}
}
}

push_drive_operation_result(cost_context, drive_operations)
Expand Down
46 changes: 26 additions & 20 deletions packages/rs-drive/src/util/grove_operations/grove_clear/v0/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,26 +47,32 @@ impl Drive {
.map(|_| ());

#[cfg(feature = "grovedb_operations_logging")]
if tracing::event_enabled!(target: "drive_grovedb_operations", tracing::Level::TRACE)
&& result.is_ok()
{
let root_hash = self
.grove
.root_hash(transaction, &drive_version.grove_version)
.unwrap()
.map_err(Error::from)?;

let (path, previous_root_hash) =
maybe_params_for_logs.expect("log params should be set above");

tracing::trace!(
target: "drive_grovedb_operations",
path = ?path.to_vec(),
?root_hash,
?previous_root_hash,
is_transactional = transaction.is_some(),
"grovedb clear",
);
if let Some((path, previous_root_hash)) = maybe_params_for_logs {
if result.is_ok() {
match self
.grove
.root_hash(transaction, &drive_version.grove_version)
.unwrap()
{
Ok(root_hash) => {
tracing::trace!(
target: "drive_grovedb_operations",
path = ?path.to_vec(),
?root_hash,
?previous_root_hash,
is_transactional = transaction.is_some(),
"grovedb clear",
);
}
Err(e) => {
tracing::warn!(
target: "drive_grovedb_operations",
error = ?e,
"failed to get root hash for post-clear logging",
);
}
}
}
}

result
Expand Down
Loading