From 453b210d0aa6fa133d6f597c2573bbc237d07d69 Mon Sep 17 00:00:00 2001 From: Colin Patrick Mccabe Date: Mon, 23 Feb 2015 19:00:10 -0800 Subject: [PATCH] HDFS-7805. NameNode recovery prompt should be printed on console (Surendra Singh Lilhore via Colin P. McCabe) (cherry picked from commit faaddb6ecb44cdc9ef82a2ab392f64fc2561e938) --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hadoop/hdfs/server/namenode/MetaRecoveryContext.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 7dbc6c428f5..8b16301d030 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -711,6 +711,9 @@ Release 2.7.0 - UNRELEASED HDFS-7807. libhdfs htable.c: fix htable resizing, add unit test (cmccabe) + HDFS-7805. NameNode recovery prompt should be printed on console (Surendra + Singh Lilhore via Colin P. McCabe) + BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS HDFS-7720. Quota by Storage Type API, tools and ClientNameNode diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/MetaRecoveryContext.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/MetaRecoveryContext.java index 80312b8856e..8831b49adb0 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/MetaRecoveryContext.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/MetaRecoveryContext.java @@ -61,9 +61,9 @@ public final class MetaRecoveryContext { public String ask(String prompt, String firstChoice, String... choices) throws IOException { while (true) { - LOG.info(prompt); + System.err.print(prompt); if (force > FORCE_NONE) { - LOG.info("automatically choosing " + firstChoice); + System.out.println("automatically choosing " + firstChoice); return firstChoice; } StringBuilder responseBuilder = new StringBuilder(); @@ -82,7 +82,7 @@ public final class MetaRecoveryContext { return c; } } - LOG.error("I'm sorry, I cannot understand your response.\n"); + System.err.print("I'm sorry, I cannot understand your response.\n"); } }