From 1ab31b1715e9db498847725dadfb82b16f71143b Mon Sep 17 00:00:00 2001 From: Todd Lipcon Date: Tue, 28 Feb 2012 18:38:40 +0000 Subject: [PATCH] HDFS-3019. Fix silent failure of TestEditLogJournalFailures. Contributed by Todd Lipcon. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1294772 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt | 2 ++ .../java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java | 1 + 2 files changed, 3 insertions(+) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt index 0dc073f332..6d2de54f3d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt @@ -234,3 +234,5 @@ HDFS-2993. HA: BackupNode#checkOperation should permit CHECKPOINT operations (el HDFS-2904. Client support for getting delegation tokens. (todd) HDFS-3013. HA: NameNode format doesn't pick up dfs.namenode.name.dir.NameServiceId configuration (Mingjie Lai via todd) + +HDFS-3019. Fix silent failure of TestEditLogJournalFailures (todd) 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 5cd8be26a9..58f329f142 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 @@ -819,6 +819,7 @@ public JournalSet getJournalSet() { @VisibleForTesting synchronized void setRuntimeForTesting(Runtime runtime) { this.runtime = runtime; + this.journalSet.setRuntimeForTesting(runtime); } /**