dannytbecker commented on code in PR #6018:
URL: https://github.com/apache/hadoop/pull/6018#discussion_r1315188530
##########
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestBootstrapStandby.java:
##########
@@ -172,6 +182,67 @@ public void testDownloadingLaterCheckpoint() throws
Exception {
restartNameNodesFromIndex(1);
}
+ /**
+ * Test for downloading a checkpoint made at a later checkpoint
+ * from the active.
+ */
+ @Test
+ public void testRollingUpgradeBootstrapStandby() throws Exception {
+ removeStandbyNameDirs();
+
+ int futureVersion = NameNodeLayoutVersion.CURRENT_LAYOUT_VERSION - 1;
+
+ DistributedFileSystem fs = cluster.getFileSystem(0);
+ fs.setSafeMode(SafeModeAction.SAFEMODE_ENTER);
+ fs.saveNamespace();
+ fs.setSafeMode(SafeModeAction.SAFEMODE_LEAVE);
+
+ // Setup BootstrapStandby to think it is a future NameNode version
+ BootstrapStandby bs = spy(new BootstrapStandby());
+ Answer<NNStorage> storageAnswer = storage -> {
+ NNStorage storageSpy = (NNStorage) spy(storage.callRealMethod());
+ doReturn(futureVersion).when(storageSpy).getServiceLayoutVersion();
+ return storageSpy;
+ };
+ doAnswer(storageAnswer).when(bs).getStorage(any(), any(), any());
+
+ bs.setConf(cluster.getConfiguration(1));
+
+ // Start rolling upgrade
+ fs.rollingUpgrade(RollingUpgradeAction.PREPARE);
+ nn0 = spy(nn0);
+
+ // Make nn0 think it is a future version
+ Answer<FSImage> fsImageAnswer = fsImage -> {
+ FSImage fsImageSpy = (FSImage) spy(fsImage.callRealMethod());
+ doAnswer(storageAnswer).when(fsImageSpy).getStorage();
+ return fsImageSpy;
+ };
+ doAnswer(fsImageAnswer).when(nn0).getFSImage();
+
+ // Roll edit logs a few times to inflate txid
+ nn0.getRpcServer().rollEditLog();
+ nn0.getRpcServer().rollEditLog();
+ // Make checkpoint
+ NameNodeAdapter.enterSafeMode(nn0, false);
+ NameNodeAdapter.saveNamespace(nn0);
+ NameNodeAdapter.leaveSafeMode(nn0);
+
+ long expectedCheckpointTxId = NameNodeAdapter.getNamesystem(nn0)
+ .getFSImage().getMostRecentCheckpointTxId();
+ assertEquals(11, expectedCheckpointTxId);
+
+ bs.run(new String[]{"-force"});
+ FSImageTestUtil.assertNNHasCheckpoints(cluster, 1,
+ ImmutableList.of((int) expectedCheckpointTxId));
+
+ // Make sure the bootstrap was successful
+ FSImageTestUtil.assertNNFilesMatch(cluster);
+
+ // We should now be able to start the standby successfully
+ cluster.restartNameNode(1, true, "-rollingUpgrade", "started");
Review Comment:
I switched it to match other bootstrap standby tests which check that the
nodes can start up.
--
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]
