From 557b937f472f9e9fecd2fbb252c2642a46c1c7bf Mon Sep 17 00:00:00 2001 From: Suresh Srinivas Date: Tue, 21 Aug 2012 22:25:49 +0000 Subject: [PATCH] HDFS-3827. TestHASafeMode#assertSafemode method should be made static. Contributed by Jing Zhao git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1375828 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../apache/hadoop/hdfs/server/namenode/ha/TestHASafeMode.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index a0bebede95e..57817d1d1cc 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -193,6 +193,9 @@ Trunk (unreleased changes) HDFS-3792. Fix two findbugs introduced by HDFS-3695 (todd) + HDFS-3827. TestHASafeMode#assertSafemode method should be made static. + (Jing Zhao via suresh) + Branch-2 ( Unreleased changes ) INCOMPATIBLE CHANGES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestHASafeMode.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestHASafeMode.java index ee704462851..f385ea43a2a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestHASafeMode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestHASafeMode.java @@ -420,8 +420,8 @@ public void testBlocksDeletedInEditLog() throws Exception { restartActive(); } - private void assertSafeMode(NameNode nn, int safe, int total) { - String status = nn1.getNamesystem().getSafemode(); + private static void assertSafeMode(NameNode nn, int safe, int total) { + String status = nn.getNamesystem().getSafemode(); if (safe == total) { assertTrue("Bad safemode status: '" + status + "'", status.startsWith(