smengcl commented on code in PR #10904:
URL: https://github.com/apache/ozone/pull/10904#discussion_r3693703733
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java:
##########
@@ -5010,6 +5041,11 @@ private OmBucketInfo resolveBucketLink(
allowDanglingBuckets, aclEnabled);
}
+ @VisibleForTesting
+ public void setCheckpointBackupInjector(FaultInjector injector) {
+ checkpointBackupInjector = injector;
+ }
Review Comment:
changed to package-private
##########
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java:
##########
@@ -557,6 +560,88 @@ public void testInstallCorruptedCheckpointFailure() throws
Exception {
assertLogCapture(logCapture, msg);
}
+ /**
+ * When the pre-install backup loop in replaceOMDBWithCheckpoint fails part
way
+ * through, every item it already relocated into om.db.backup.* must be put
back.
+ * Today the loop has no catch, so the items stay in the backup directory:
the
+ * one that was moved first is lost, and if that item is om.db then
reloadOMState
+ * silently re-creates an empty one.
+ */
+ @Test
+ public void testInstallSnapshotFailedBackupRestoresDbDir() throws Exception {
+ final String leaderOMNodeId =
OmTestUtil.getCurrentOmProxyNodeId(objectStore);
+ OzoneManager leaderOM = cluster.getOzoneManager(leaderOMNodeId);
+ OzoneManagerRatisServer leaderRatisServer = leaderOM.getOmRatisServer();
+
+ // Find the inactive OM, so the checkpoint index is ahead of its applied
index
+ // and canProceed lets the replacement start.
+ String followerNodeId = leaderOM.getPeerNodes().get(0).getNodeId();
+ if (cluster.isOMActive(followerNodeId)) {
+ followerNodeId = leaderOM.getPeerNodes().get(1).getNodeId();
+ }
+ OzoneManager followerOM = cluster.getOzoneManager(followerNodeId);
+
+ writeKeysToIncreaseLogIndex(leaderRatisServer, 100);
+
+ // Build a checkpoint whose top level holds two entries, so the backup loop
+ // performs two moves and can fail on the second.
+ DBCheckpoint leaderDbCheckpoint =
+ leaderOM.getMetadataManager().getStore().getCheckpoint(false);
+ Path leaderCheckpointLocation = leaderDbCheckpoint.getCheckpointLocation();
+ assertNotNull(leaderCheckpointLocation);
+ Path omDbDir = leaderCheckpointLocation.resolve(OM_DB_NAME);
+ assertTrue(omDbDir.toFile().mkdir());
+ moveCheckpointContentsToOmDbDir(leaderCheckpointLocation, omDbDir);
+ Files.createDirectory(leaderCheckpointLocation.resolve(OM_SNAPSHOT_DIR));
Review Comment:
done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
