You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by to...@apache.org on 2012/04/11 07:28:51 UTC
svn commit: r1324563 - in
/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt
src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
Author: todd
Date: Wed Apr 11 05:28:51 2012
New Revision: 1324563
URL: http://svn.apache.org/viewvc?rev=1324563&view=rev
Log:
HDFS-3249. Use ToolRunner.confirmPrompt in NameNode. Contributed by Todd Lipcon.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1324563&r1=1324562&r2=1324563&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Wed Apr 11 05:28:51 2012
@@ -239,6 +239,8 @@ Release 2.0.0 - UNRELEASED
HDFS-3247. Improve bootstrapStandby behavior when original NN is not active
(todd)
+ HDFS-3249. Use ToolRunner.confirmPrompt in NameNode (todd)
+
OPTIMIZATIONS
HDFS-2477. Optimize computing the diff between a block report and the
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java?rev=1324563&r1=1324562&r2=1324563&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java Wed Apr 11 05:28:51 2012
@@ -72,6 +72,7 @@ import org.apache.hadoop.security.author
import org.apache.hadoop.tools.GetUserMappingsProtocol;
import org.apache.hadoop.util.ServicePlugin;
import org.apache.hadoop.util.StringUtils;
+import static org.apache.hadoop.util.ToolRunner.confirmPrompt;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Lists;
@@ -971,34 +972,6 @@ public class NameNode {
}
}
- /**
- * Print out a prompt to the user, and return true if the user
- * responds with "Y" or "yes".
- */
- static boolean confirmPrompt(String prompt) throws IOException {
- while (true) {
- System.err.print(prompt + " (Y or N) ");
- StringBuilder responseBuilder = new StringBuilder();
- while (true) {
- int c = System.in.read();
- if (c == -1 || c == '\r' || c == '\n') {
- break;
- }
- responseBuilder.append((char)c);
- }
-
- String response = responseBuilder.toString();
- if (response.equalsIgnoreCase("y") ||
- response.equalsIgnoreCase("yes")) {
- return true;
- } else if (response.equalsIgnoreCase("n") ||
- response.equalsIgnoreCase("no")) {
- return false;
- }
- // else ask them again
- }
- }
-
public static NameNode createNameNode(String argv[], Configuration conf)
throws IOException {
if (conf == null)