Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 16 additions & 16 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ members = [
[workspace.dependencies]
secp256k1 = { version = "=0.33.1", features = ["rand", "serde", "recovery"] }
bincode = { package = "grovedb-bincode", version = "=2.1.0" }
grovedb = { git = "https://github.com/dashpay/grovedb", rev = "fa92511cb7cdc19f5977d64f20f93107f62844b1", default-features = false }
grovedb-costs = { git = "https://github.com/dashpay/grovedb", rev = "fa92511cb7cdc19f5977d64f20f93107f62844b1" }
grovedb-merk = { git = "https://github.com/dashpay/grovedb", rev = "fa92511cb7cdc19f5977d64f20f93107f62844b1", default-features = false }
grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "fa92511cb7cdc19f5977d64f20f93107f62844b1" }
grovedb-query = { git = "https://github.com/dashpay/grovedb", rev = "fa92511cb7cdc19f5977d64f20f93107f62844b1" }
grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "fa92511cb7cdc19f5977d64f20f93107f62844b1" }
grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "fa92511cb7cdc19f5977d64f20f93107f62844b1" }
grovedb-epoch-based-storage-flags = { git = "https://github.com/dashpay/grovedb", rev = "fa92511cb7cdc19f5977d64f20f93107f62844b1" }
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "fa92511cb7cdc19f5977d64f20f93107f62844b1" }
grovedb = { git = "https://github.com/dashpay/grovedb", rev = "89dc7351f09f5e5425025861fdc1892473569917", default-features = false }
grovedb-costs = { git = "https://github.com/dashpay/grovedb", rev = "89dc7351f09f5e5425025861fdc1892473569917" }
grovedb-merk = { git = "https://github.com/dashpay/grovedb", rev = "89dc7351f09f5e5425025861fdc1892473569917", default-features = false }
grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "89dc7351f09f5e5425025861fdc1892473569917" }
grovedb-query = { git = "https://github.com/dashpay/grovedb", rev = "89dc7351f09f5e5425025861fdc1892473569917" }
grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "89dc7351f09f5e5425025861fdc1892473569917" }
grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "89dc7351f09f5e5425025861fdc1892473569917" }
grovedb-epoch-based-storage-flags = { git = "https://github.com/dashpay/grovedb", rev = "89dc7351f09f5e5425025861fdc1892473569917" }
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "89dc7351f09f5e5425025861fdc1892473569917" }
dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "f6bb90cbbcae3d401bb3c9ebc4a9a26873a41404" }
dash-network-seeds = { git = "https://github.com/dashpay/rust-dashcore", rev = "f6bb90cbbcae3d401bb3c9ebc4a9a26873a41404" }
dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "f6bb90cbbcae3d401bb3c9ebc4a9a26873a41404" }
Expand Down
10 changes: 10 additions & 0 deletions packages/rs-drive-abci/src/abci/handler/finalize_block.rs
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,16 @@ where
"flushed pending prefix drops"
);
}
// A record whose liveness check failed stays queued and is
// retried on the next flush; a count that keeps coming back
// points at a storage fault or undecodable bytes.
if report.unresolved_records > 0 {
tracing::warn!(
unresolved_records = report.unresolved_records,
first_unresolved_error = report.first_unresolved_error.as_deref(),
"pending prefix drops left unresolved; records persist and will be retried"
);
}
}
Err(error) => {
tracing::warn!(
Expand Down
24 changes: 18 additions & 6 deletions packages/rs-drive-abci/src/platform_types/platform/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -167,15 +167,27 @@ impl<C> Platform<C> {
// when no records exist; a failure leaves the records for the
// per-block flush to retry.
if let Some(platform_version) = current_platform_version {
if let Err(error) = drive
match drive
.grove
.flush_pending_prefix_drops(&platform_version.drive.grove_version)
{
tracing::warn!(
?error,
"failed to flush pending prefix drops at startup; records persist and \
will be retried after the next block"
);
Ok(report) => {
if report.unresolved_records > 0 {
tracing::warn!(
unresolved_records = report.unresolved_records,
first_unresolved_error = report.first_unresolved_error.as_deref(),
"pending prefix drops left unresolved at startup; records persist \
and will be retried after the next block"
);
}
}
Err(error) => {
tracing::warn!(
?error,
"failed to flush pending prefix drops at startup; records persist and \
will be retried after the next block"
);
}
}
}

Expand Down
Loading