From 82cd85d8680912b8d268c875bd51598b20f3313c Mon Sep 17 00:00:00 2001 From: Andrew Wang Date: Mon, 9 Oct 2017 17:53:56 -0700 Subject: [PATCH] Revert "HDFS-12603. Enable async edit logging by default." This reverts commit afb42aeabf1317b755ab79e0265bc90920c896ac. --- .../org/apache/hadoop/hdfs/DFSConfigKeys.java | 2 +- .../hdfs/server/namenode/FSEditLog.java | 7 +----- .../hdfs/server/namenode/FSEditLogAsync.java | 5 ----- .../src/main/resources/hdfs-default.xml | 2 +- .../namenode/ha/TestFailureToReadEdits.java | 22 ++++++------------- 5 files changed, 10 insertions(+), 28 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java index 395b1927fa3..1f96763f5cb 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java @@ -326,7 +326,7 @@ public class DFSConfigKeys extends CommonConfigurationKeys { public static final String DFS_NAMENODE_EDITS_ASYNC_LOGGING = "dfs.namenode.edits.asynclogging"; - public static final boolean DFS_NAMENODE_EDITS_ASYNC_LOGGING_DEFAULT = true; + public static final boolean DFS_NAMENODE_EDITS_ASYNC_LOGGING_DEFAULT = false; public static final String DFS_LIST_LIMIT = "dfs.ls.limit"; public static final int DFS_LIST_LIMIT_DEFAULT = 1000; diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java index 7d19b048edf..a8f5bfaa32e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java @@ -130,7 +130,7 @@ public class FSEditLog implements LogsPurgeable { * * In a non-HA setup: * - * The log starts in UNINITIALIZED state upon construction. Once it's + * The log starts in UNITIALIZED state upon construction. Once it's * initialized, it is usually in IN_SEGMENT state, indicating that edits may * be written. In the middle of a roll, or while saving the namespace, it * briefly enters the BETWEEN_LOG_SEGMENTS state, indicating that the previous @@ -1837,9 +1837,4 @@ public class FSEditLog implements LogsPurgeable { } return count; } - - @Override - public String toString() { - return super.toString(); - } } diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogAsync.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogAsync.java index 1f5dc757f01..c14a31021ff 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogAsync.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogAsync.java @@ -319,9 +319,4 @@ class FSEditLogAsync extends FSEditLog implements Runnable { return "["+getClass().getSimpleName()+" op:"+op+" call:"+call+"]"; } } - - @Override - public String toString() { - return super.toString(); - } } diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml index 3752578f7c9..3491ed2c909 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml @@ -4105,7 +4105,7 @@ dfs.namenode.edits.asynclogging - true + false If set to true, enables asynchronous edit logs in the Namenode. If set to false, the Namenode uses the traditional synchronous edit logs. diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestFailureToReadEdits.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestFailureToReadEdits.java index 2bc246d5238..93c717c3eb2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestFailureToReadEdits.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestFailureToReadEdits.java @@ -75,7 +75,6 @@ public class TestFailureToReadEdits { private static final Random RANDOM = new Random(); private final TestType clusterType; - private final boolean useAsyncEditLogging; private Configuration conf; private MiniDFSCluster cluster; private MiniQJMHACluster miniQjmHaCluster; // for QJM case only @@ -89,23 +88,18 @@ public class TestFailureToReadEdits { }; /** - * Run this suite of tests for {QJM-based, file-based HA} x {async - * edit logging enabled, disabled}. + * Run this suite of tests both for QJM-based HA and for file-based + * HA. */ @Parameters public static Iterable data() { - return Arrays.asList(new Object[][]{ - {TestType.SHARED_DIR_HA, Boolean.FALSE}, - {TestType.SHARED_DIR_HA, Boolean.TRUE}, - {TestType.QJM_HA, Boolean.FALSE}, - {TestType.QJM_HA, Boolean.TRUE}, - }); + return Arrays.asList(new Object[][] { + { TestType.SHARED_DIR_HA }, + { TestType.QJM_HA } }); } - - public TestFailureToReadEdits(TestType clusterType, Boolean - useAsyncEditLogging) { + + public TestFailureToReadEdits(TestType clusterType) { this.clusterType = clusterType; - this.useAsyncEditLogging = useAsyncEditLogging; } @Before @@ -115,8 +109,6 @@ public class TestFailureToReadEdits { conf.setInt(DFSConfigKeys.DFS_NAMENODE_CHECKPOINT_TXNS_KEY, 1); conf.setInt(DFSConfigKeys.DFS_NAMENODE_NUM_CHECKPOINTS_RETAINED_KEY, 10); conf.setInt(DFSConfigKeys.DFS_HA_TAILEDITS_PERIOD_KEY, 1); - conf.setBoolean(DFSConfigKeys.DFS_NAMENODE_EDITS_ASYNC_LOGGING, - useAsyncEditLogging); HAUtil.setAllowStandbyReads(conf, true); if (clusterType == TestType.SHARED_DIR_HA) {