Return-Path: X-Original-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4DCD29157 for ; Wed, 11 Apr 2012 05:29:23 +0000 (UTC) Received: (qmail 24539 invoked by uid 500); 11 Apr 2012 05:29:23 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 24496 invoked by uid 500); 11 Apr 2012 05:29:23 -0000 Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hdfs-dev@hadoop.apache.org Delivered-To: mailing list hdfs-commits@hadoop.apache.org Received: (qmail 24487 invoked by uid 99); 11 Apr 2012 05:29:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Apr 2012 05:29:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Apr 2012 05:29:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1E9082388AF0; Wed, 11 Apr 2012 05:28:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1324564 - in /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java Date: Wed, 11 Apr 2012 05:28:58 -0000 To: hdfs-commits@hadoop.apache.org From: todd@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120411052859.1E9082388AF0@eris.apache.org> Author: todd Date: Wed Apr 11 05:28:58 2012 New Revision: 1324564 URL: http://svn.apache.org/viewvc?rev=1324564&view=rev Log: HDFS-3249. Use ToolRunner.confirmPrompt in NameNode. Contributed by Todd Lipcon. Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1324564&r1=1324563&r2=1324564&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Wed Apr 11 05:28:58 2012 @@ -365,6 +365,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-3024. Improve performance of stringification in addStoredBlock (todd) Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java?rev=1324564&r1=1324563&r2=1324564&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java Wed Apr 11 05:28:58 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)