This is an automated email from the ASF dual-hosted git repository.
omalley pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new cd929457c93 HDFS-16836: StandbyCheckpointer shouldn't trigger rollback
fs image after RU is finalized (#5135)
cd929457c93 is described below
commit cd929457c93f4c2460909ab65d2d3cc4e2f817ab
Author: Lei Yang <nkbua...@gmail.com>
AuthorDate: Tue Nov 15 15:06:37 2022 -0800
HDFS-16836: StandbyCheckpointer shouldn't trigger rollback fs image after
RU is finalized (#5135)
Co-authored-by: Lei Yang <ley...@linkedin.com>
---
.../hdfs/server/namenode/FSEditLogLoader.java | 1 +
.../org/apache/hadoop/hdfs/TestRollingUpgrade.java | 36 ++++++++++++++++++++++
2 files changed, 37 insertions(+)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java
index a065fe6c0cf..efbc3b20c60 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java
@@ -912,6 +912,7 @@ public class FSEditLogLoader {
fsNamesys.getFSImage().updateStorageVersion();
fsNamesys.getFSImage().renameCheckpoint(NameNodeFile.IMAGE_ROLLBACK,
NameNodeFile.IMAGE);
+ fsNamesys.setNeedRollbackFsImage(false);
break;
}
case OP_ADD_CACHE_DIRECTIVE: {
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestRollingUpgrade.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestRollingUpgrade.java
index 6e7014c42eb..bb5da24a682 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestRollingUpgrade.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestRollingUpgrade.java
@@ -33,6 +33,9 @@ import javax.management.ObjectName;
import javax.management.ReflectionException;
import javax.management.openmbean.CompositeDataSupport;
+import org.apache.hadoop.hdfs.protocol.HdfsConstants;
+import org.apache.hadoop.hdfs.server.namenode.NameNode;
+import org.apache.hadoop.hdfs.server.namenode.ha.HATestUtil;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
import org.slf4j.Logger;
@@ -720,6 +723,39 @@ public class TestRollingUpgrade {
}
}
+ @Test
+ public void testEditLogTailerRollingUpgrade() throws IOException,
InterruptedException {
+ Configuration conf = new Configuration();
+ conf.setInt(DFSConfigKeys.DFS_HA_TAILEDITS_PERIOD_KEY, 1);
+ conf.setInt(DFSConfigKeys.DFS_NAMENODE_CHECKPOINT_PERIOD_KEY, 1);
+
+ HAUtil.setAllowStandbyReads(conf, true);
+
+ MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf)
+ .nnTopology(MiniDFSNNTopology.simpleHATopology())
+ .numDataNodes(0)
+ .build();
+ cluster.waitActive();
+
+ cluster.transitionToActive(0);
+
+ NameNode nn1 = cluster.getNameNode(0);
+ NameNode nn2 = cluster.getNameNode(1);
+ try {
+ // RU start should trigger rollback image in standbycheckpointer
+
nn1.getRpcServer().rollingUpgrade(HdfsConstants.RollingUpgradeAction.PREPARE);
+ HATestUtil.waitForStandbyToCatchUp(nn1, nn2);
+ Assert.assertTrue(nn2.getNamesystem().isNeedRollbackFsImage());
+
+ // RU finalize should reset rollback image flag in standbycheckpointer
+
nn1.getRpcServer().rollingUpgrade(HdfsConstants.RollingUpgradeAction.FINALIZE);
+ HATestUtil.waitForStandbyToCatchUp(nn1, nn2);
+ Assert.assertFalse(nn2.getNamesystem().isNeedRollbackFsImage());
+ } finally {
+ cluster.shutdown();
+ }
+ }
+
/**
* In non-HA setup, after rolling upgrade prepare, the Secondary NN should
* still be able to do checkpoint
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
