svn commit: r1330946 - in /accumulo/trunk: ./ core/ server/ server/src/main/java/org/apache/accumulo/server/util/Initialize.java

[ecn]

Author: ecn
Date: Thu Apr 26 16:47:31 2012
New Revision: 1330946

URL: http://svn.apache.org/viewvc?rev=1330946&view=rev
Log:
ACCUMULO-599 merge to trunk

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/core/   (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.3:r1330944

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.3/core:r1330944

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.3/server:r1330944

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=1330946&r1=1330945&r2=1330946&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 26 16:47:31 2012
@@ -131,8 +131,6 @@ public class Initialize {
       c.printNewline();
     }
     
-    UUID uuid = UUID.randomUUID();
-    
     try {
       if (isInitialized(fs)) {
         log.fatal("It appears this location was previously initialized, 
exiting ... ");
@@ -152,7 +150,12 @@ public class Initialize {
       return false;
     }
     byte[] rootpass = getRootPassword();
+    return initialize(instanceNamePath, fs, rootpass);
+  }
+  
+  public static boolean initialize(String instanceNamePath, FileSystem fs, 
byte[] rootpass) {
     
+    UUID uuid = UUID.randomUUID();
     try {
       initZooKeeper(uuid.toString(), instanceNamePath);
     } catch (Exception e) {
@@ -161,7 +164,7 @@ public class Initialize {
     }
     
     try {
-      initFileSystem(fs, conf, uuid);
+      initFileSystem(fs, fs.getConf(), uuid);
     } catch (Exception e) {
       log.fatal("Failed to initialize filesystem", e);
       return false;