You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2013/04/18 20:07:10 UTC
svn commit: r1469502 - in /accumulo/trunk: ./ server/
server/src/main/java/org/apache/accumulo/server/util/Initialize.java
Author: vines
Date: Thu Apr 18 18:07:10 2013
New Revision: 1469502
URL: http://svn.apache.org/r1469502
Log:
ACCUMULO-1319 - no more root user prompt
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1469498
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1469498
Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/Initialize.java?rev=1469502&r1=1469501&r2=1469502&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/Initialize.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/Initialize.java Thu Apr 18 18:07:10 2013
@@ -158,7 +158,6 @@ public class Initialize {
log.fatal("Failed to talk to zookeeper", e);
return false;
}
- opts.rootuser = getRootUser(opts);
opts.rootpass = getRootPassword(opts);
return initialize(opts, instanceNamePath, fs);
}
@@ -401,20 +400,7 @@ public class Initialize {
} while (exists);
return instanceNamePath;
}
-
- private static String getRootUser(Opts opts) throws IOException {
- if (opts.cliUser != null) {
- return opts.cliUser;
- }
- String rootuser;
- rootuser = getConsoleReader().readLine("Enter name for initial root user (" + DEFAULT_ROOT_USER + "): ", '*');
- if (rootuser == null)
- System.exit(0);
- if (rootuser.equals(""))
- return DEFAULT_ROOT_USER;
- return rootuser;
- }
-
+
private static byte[] getRootPassword(Opts opts) throws IOException {
if (opts.cliPassword != null) {
return opts.cliPassword.getBytes();
@@ -422,10 +408,10 @@ public class Initialize {
String rootpass;
String confirmpass;
do {
- rootpass = getConsoleReader().readLine("Enter initial password for " + opts.rootuser + " (this may not be applicable for your security setup): ", '*');
+ rootpass = getConsoleReader().readLine("Enter initial password for " + DEFAULT_ROOT_USER + " (this may not be applicable for your security setup): ", '*');
if (rootpass == null)
System.exit(0);
- confirmpass = getConsoleReader().readLine("Confirm initial password for " + opts.rootuser + ": ", '*');
+ confirmpass = getConsoleReader().readLine("Confirm initial password for " + DEFAULT_ROOT_USER + ": ", '*');
if (confirmpass == null)
System.exit(0);
if (!rootpass.equals(confirmpass))
@@ -435,7 +421,7 @@ public class Initialize {
}
private static void initSecurity(Opts opts, String iid) throws AccumuloSecurityException, ThriftSecurityException {
- AuditedSecurityOperation.getInstance(iid, true).initializeSecurity(SecurityConstants.getSystemCredentials(), opts.rootuser, opts.rootpass);
+ AuditedSecurityOperation.getInstance(iid, true).initializeSecurity(SecurityConstants.getSystemCredentials(), DEFAULT_ROOT_USER, opts.rootpass);
}
protected static void initMetadataConfig() throws IOException {
@@ -486,7 +472,6 @@ public class Initialize {
String cliUser;
byte[] rootpass = null;
- String rootuser = null;
}
public static void main(String[] args) {
@@ -501,7 +486,6 @@ public class Initialize {
if (opts.resetSecurity) {
if (isInitialized(fs)) {
- opts.rootuser = getRootUser(opts);
opts.rootpass = getRootPassword(opts);
initSecurity(opts, HdfsZooInstance.getInstance().getInstanceID());
} else {