fix: 18405: Bucket integrity check in HDHM.ReadUpdateBucketTask can be improved - cherry-pick. (#18406)

imalygin · artemananiev · web-flow · commit 6364a5484a8b · 2025-03-19T15:07:21.000-05:00
Signed-off-by: Ivan Malygin &lt;ivan@swirldslabs.com&gt;
Co-authored-by: artemananiev &lt;33361937+artemananiev@users.noreply.github.com&gt;
diff --git a/platform-sdk/swirlds-merkledb/src/main/java/com/swirlds/merkledb/files/hashmap/HalfDiskHashMap.java b/platform-sdk/swirlds-merkledb/src/main/java/com/swirlds/merkledb/files/hashmap/HalfDiskHashMap.java
@@ -607,8 +607,11 @@ protected boolean onExecute() throws IOException {
                 // Read from bytes
                 bucket.readFrom(bucketData);
                 if (bucketIndex != bucket.getBucketIndex()) {
-                    throw new RuntimeException(
+                    logger.warn(
+                            MERKLE_DB.getMarker(),
                             "Bucket index integrity check " + bucketIndex + " != " + bucket.getBucketIndex());
+                    bucket.clear();
+                    bucket.setBucketIndex(bucketIndex);
                 }
             }
             // Apply all updates

Original file line number	Diff line number	Diff line change
`@@ -607,8 +607,11 @@ protected boolean onExecute() throws IOException {`
`607`	`607`	`// Read from bytes`
`608`	`608`	`bucket.readFrom(bucketData);`
`609`	`609`	`if (bucketIndex != bucket.getBucketIndex()) {`
`610`		`- throw new RuntimeException(`
	`610`	`+ logger.warn(`
	`611`	`+ MERKLE_DB.getMarker(),`
`611`	`612`	`"Bucket index integrity check " + bucketIndex + " != " + bucket.getBucketIndex());`
	`613`	`+ bucket.clear();`
	`614`	`+ bucket.setBucketIndex(bucketIndex);`
`612`	`615`	`}`
`613`	`616`	`}`
`614`	`617`	`// Apply all updates`