accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bil...@apache.org
Subject svn commit: r1300192 - in /incubator/accumulo/trunk: ./ bin/ conf/ conf/examples/ conf/examples/1GB/ conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/ conf/examples/2GB/ conf/examples/2GB/native-standalone/ conf/examples/2GB/standalone...
Date Tue, 13 Mar 2012 15:32:52 GMT
Author: billie
Date: Tue Mar 13 15:32:49 2012
New Revision: 1300192

URL: http://svn.apache.org/viewvc?rev=1300192&view=rev
Log:
ACCUMULO-390 merged to trunk

Added:
    incubator/accumulo/trunk/conf/examples/
      - copied from r1300181, incubator/accumulo/branches/1.4/conf/examples/
    incubator/accumulo/trunk/conf/examples/1GB/
      - copied from r1300181, incubator/accumulo/branches/1.4/conf/examples/1GB/
    incubator/accumulo/trunk/conf/examples/1GB/native-standalone/
      - copied from r1300181, incubator/accumulo/branches/1.4/conf/examples/1GB/native-standalone/
    incubator/accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-env.sh
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/1GB/native-standalone/accumulo-env.sh
    incubator/accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-metrics.xml
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/1GB/native-standalone/accumulo-metrics.xml
    incubator/accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/1GB/native-standalone/accumulo-site.xml
    incubator/accumulo/trunk/conf/examples/1GB/native-standalone/gc
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/1GB/native-standalone/gc
    incubator/accumulo/trunk/conf/examples/1GB/native-standalone/masters
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/1GB/native-standalone/masters
    incubator/accumulo/trunk/conf/examples/1GB/native-standalone/monitor
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/1GB/native-standalone/monitor
    incubator/accumulo/trunk/conf/examples/1GB/native-standalone/slaves
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/1GB/native-standalone/slaves
    incubator/accumulo/trunk/conf/examples/1GB/native-standalone/tracers
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/1GB/native-standalone/tracers
    incubator/accumulo/trunk/conf/examples/1GB/standalone/
      - copied from r1300181, incubator/accumulo/branches/1.4/conf/examples/1GB/standalone/
    incubator/accumulo/trunk/conf/examples/1GB/standalone/accumulo-env.sh
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/1GB/standalone/accumulo-env.sh
    incubator/accumulo/trunk/conf/examples/1GB/standalone/accumulo-metrics.xml
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/1GB/standalone/accumulo-metrics.xml
    incubator/accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/1GB/standalone/accumulo-site.xml
    incubator/accumulo/trunk/conf/examples/1GB/standalone/gc
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/1GB/standalone/gc
    incubator/accumulo/trunk/conf/examples/1GB/standalone/masters
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/1GB/standalone/masters
    incubator/accumulo/trunk/conf/examples/1GB/standalone/monitor
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/1GB/standalone/monitor
    incubator/accumulo/trunk/conf/examples/1GB/standalone/slaves
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/1GB/standalone/slaves
    incubator/accumulo/trunk/conf/examples/1GB/standalone/tracers
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/1GB/standalone/tracers
    incubator/accumulo/trunk/conf/examples/2GB/
      - copied from r1300181, incubator/accumulo/branches/1.4/conf/examples/2GB/
    incubator/accumulo/trunk/conf/examples/2GB/native-standalone/
      - copied from r1300181, incubator/accumulo/branches/1.4/conf/examples/2GB/native-standalone/
    incubator/accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-env.sh
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/2GB/native-standalone/accumulo-env.sh
    incubator/accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-metrics.xml
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/2GB/native-standalone/accumulo-metrics.xml
    incubator/accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/2GB/native-standalone/accumulo-site.xml
    incubator/accumulo/trunk/conf/examples/2GB/native-standalone/gc
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/2GB/native-standalone/gc
    incubator/accumulo/trunk/conf/examples/2GB/native-standalone/masters
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/2GB/native-standalone/masters
    incubator/accumulo/trunk/conf/examples/2GB/native-standalone/monitor
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/2GB/native-standalone/monitor
    incubator/accumulo/trunk/conf/examples/2GB/native-standalone/slaves
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/2GB/native-standalone/slaves
    incubator/accumulo/trunk/conf/examples/2GB/native-standalone/tracers
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/2GB/native-standalone/tracers
    incubator/accumulo/trunk/conf/examples/2GB/standalone/
      - copied from r1300181, incubator/accumulo/branches/1.4/conf/examples/2GB/standalone/
    incubator/accumulo/trunk/conf/examples/2GB/standalone/accumulo-env.sh
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/2GB/standalone/accumulo-env.sh
    incubator/accumulo/trunk/conf/examples/2GB/standalone/accumulo-metrics.xml
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/2GB/standalone/accumulo-metrics.xml
    incubator/accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/2GB/standalone/accumulo-site.xml
    incubator/accumulo/trunk/conf/examples/2GB/standalone/gc
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/2GB/standalone/gc
    incubator/accumulo/trunk/conf/examples/2GB/standalone/masters
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/2GB/standalone/masters
    incubator/accumulo/trunk/conf/examples/2GB/standalone/monitor
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/2GB/standalone/monitor
    incubator/accumulo/trunk/conf/examples/2GB/standalone/slaves
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/2GB/standalone/slaves
    incubator/accumulo/trunk/conf/examples/2GB/standalone/tracers
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/2GB/standalone/tracers
    incubator/accumulo/trunk/conf/examples/3GB/
      - copied from r1300181, incubator/accumulo/branches/1.4/conf/examples/3GB/
    incubator/accumulo/trunk/conf/examples/3GB/native-standalone/
      - copied from r1300181, incubator/accumulo/branches/1.4/conf/examples/3GB/native-standalone/
    incubator/accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-env.sh
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/3GB/native-standalone/accumulo-env.sh
    incubator/accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-metrics.xml
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/3GB/native-standalone/accumulo-metrics.xml
    incubator/accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-site.xml
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/3GB/native-standalone/accumulo-site.xml
    incubator/accumulo/trunk/conf/examples/3GB/native-standalone/gc
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/3GB/native-standalone/gc
    incubator/accumulo/trunk/conf/examples/3GB/native-standalone/masters
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/3GB/native-standalone/masters
    incubator/accumulo/trunk/conf/examples/3GB/native-standalone/monitor
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/3GB/native-standalone/monitor
    incubator/accumulo/trunk/conf/examples/3GB/native-standalone/slaves
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/3GB/native-standalone/slaves
    incubator/accumulo/trunk/conf/examples/3GB/native-standalone/tracers
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/3GB/native-standalone/tracers
    incubator/accumulo/trunk/conf/examples/3GB/standalone/
      - copied from r1300181, incubator/accumulo/branches/1.4/conf/examples/3GB/standalone/
    incubator/accumulo/trunk/conf/examples/3GB/standalone/accumulo-env.sh
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/3GB/standalone/accumulo-env.sh
    incubator/accumulo/trunk/conf/examples/3GB/standalone/accumulo-metrics.xml
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/3GB/standalone/accumulo-metrics.xml
    incubator/accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/3GB/standalone/accumulo-site.xml
    incubator/accumulo/trunk/conf/examples/3GB/standalone/gc
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/3GB/standalone/gc
    incubator/accumulo/trunk/conf/examples/3GB/standalone/masters
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/3GB/standalone/masters
    incubator/accumulo/trunk/conf/examples/3GB/standalone/monitor
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/3GB/standalone/monitor
    incubator/accumulo/trunk/conf/examples/3GB/standalone/slaves
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/3GB/standalone/slaves
    incubator/accumulo/trunk/conf/examples/3GB/standalone/tracers
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/3GB/standalone/tracers
    incubator/accumulo/trunk/conf/examples/512MB/
      - copied from r1300181, incubator/accumulo/branches/1.4/conf/examples/512MB/
    incubator/accumulo/trunk/conf/examples/512MB/native-standalone/
      - copied from r1300181, incubator/accumulo/branches/1.4/conf/examples/512MB/native-standalone/
    incubator/accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-env.sh
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/512MB/native-standalone/accumulo-env.sh
    incubator/accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-metrics.xml
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/512MB/native-standalone/accumulo-metrics.xml
    incubator/accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-site.xml
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/512MB/native-standalone/accumulo-site.xml
    incubator/accumulo/trunk/conf/examples/512MB/native-standalone/gc
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/512MB/native-standalone/gc
    incubator/accumulo/trunk/conf/examples/512MB/native-standalone/masters
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/512MB/native-standalone/masters
    incubator/accumulo/trunk/conf/examples/512MB/native-standalone/monitor
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/512MB/native-standalone/monitor
    incubator/accumulo/trunk/conf/examples/512MB/native-standalone/slaves
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/512MB/native-standalone/slaves
    incubator/accumulo/trunk/conf/examples/512MB/native-standalone/tracers
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/512MB/native-standalone/tracers
    incubator/accumulo/trunk/conf/examples/512MB/standalone/
      - copied from r1300181, incubator/accumulo/branches/1.4/conf/examples/512MB/standalone/
    incubator/accumulo/trunk/conf/examples/512MB/standalone/accumulo-env.sh
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/512MB/standalone/accumulo-env.sh
    incubator/accumulo/trunk/conf/examples/512MB/standalone/accumulo-metrics.xml
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/512MB/standalone/accumulo-metrics.xml
    incubator/accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/512MB/standalone/accumulo-site.xml
    incubator/accumulo/trunk/conf/examples/512MB/standalone/gc
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/512MB/standalone/gc
    incubator/accumulo/trunk/conf/examples/512MB/standalone/masters
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/512MB/standalone/masters
    incubator/accumulo/trunk/conf/examples/512MB/standalone/monitor
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/512MB/standalone/monitor
    incubator/accumulo/trunk/conf/examples/512MB/standalone/slaves
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/512MB/standalone/slaves
    incubator/accumulo/trunk/conf/examples/512MB/standalone/tracers
      - copied unchanged from r1300181, incubator/accumulo/branches/1.4/conf/examples/512MB/standalone/tracers
Removed:
    incubator/accumulo/trunk/conf/accumulo-env.sh.1GBstandalone-default-example
    incubator/accumulo/trunk/conf/accumulo-env.sh.1GBstandalone-native-example
    incubator/accumulo/trunk/conf/accumulo-env.sh.2GBstandalone-default-example
    incubator/accumulo/trunk/conf/accumulo-env.sh.2GBstandalone-native-example
    incubator/accumulo/trunk/conf/accumulo-env.sh.3GBcluster-default-example
    incubator/accumulo/trunk/conf/accumulo-env.sh.3GBcluster-native-example
    incubator/accumulo/trunk/conf/accumulo-env.sh.512MBBstandalone-default-example
    incubator/accumulo/trunk/conf/accumulo-env.sh.512MBBstandalone-native-example
    incubator/accumulo/trunk/conf/accumulo-metrics.xml.example
    incubator/accumulo/trunk/conf/accumulo-site.xml.1GBstandalone-example
    incubator/accumulo/trunk/conf/accumulo-site.xml.2GBstandalone-example
    incubator/accumulo/trunk/conf/accumulo-site.xml.3GBcluster-example
    incubator/accumulo/trunk/conf/accumulo-site.xml.512MBBstandalone-example
    incubator/accumulo/trunk/conf/accumulo.policy.example
    incubator/accumulo/trunk/conf/gc.example
    incubator/accumulo/trunk/conf/masters.example
    incubator/accumulo/trunk/conf/monitor.example
    incubator/accumulo/trunk/conf/slaves.example
    incubator/accumulo/trunk/conf/tracers.example
Modified:
    incubator/accumulo/trunk/   (props changed)
    incubator/accumulo/trunk/README
    incubator/accumulo/trunk/bin/accumulo
    incubator/accumulo/trunk/bin/config.sh
    incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
    incubator/accumulo/trunk/src/start/src/test/java/org/apache/accumulo/start/Test.java

Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 13 15:32:49 2012
@@ -1,3 +1,3 @@
 /incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632
 /incubator/accumulo/branches/1.3.5rc:1209938
-/incubator/accumulo/branches/1.4:1201902-1299899
+/incubator/accumulo/branches/1.4:1201902-1300181

Modified: incubator/accumulo/trunk/README
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/README?rev=1300192&r1=1300191&r2=1300192&view=diff
==============================================================================
--- incubator/accumulo/trunk/README (original)
+++ incubator/accumulo/trunk/README Tue Mar 13 15:32:49 2012
@@ -44,6 +44,7 @@ accumulo.
 ******************************************************************************
 3. Upgrading from 1.3 to 1.4
 
+There are no steps for upgrading from 1.3 to 1.4.
 
 ******************************************************************************
 4. Configuring
@@ -64,23 +65,38 @@ have password-less ssh set up as describ
 You will need to have hadoop installed and configured on your system.
 Accumulo 1.5.0-incubating-SNAPSHOT has been tested with hadoop version 0.20.2.
 
-Create a "slaves" file in $ACCUMULO_HOME/conf/.  This is a list of machines
-where tablet servers and loggers will run.
+The example accumulo configuration files are placed in directories based on the 
+memory footprint for the accumulo processes.  If you are using native libraries
+for you tablet server in-memory map, then you can use the files in "native-standalone".
+If you get warnings about not being able to load the native libraries, you can
+use the configuration files in "standalone".
 
-Create a "masters" file in $ACCUMULO_HOME/conf/.  This is a list of
-machines where the master server will run. 
+For testing on a single computer, use a fairly small configuration:
+
+  $ cp conf/examples/512MB/native-standalone/* conf
 
-Create conf/accumulo-env.sh following the template of
-conf/accumulo-env.sh.*-example.  Set JAVA_HOME, HADOOP_HOME, and ZOOKEEPER_HOME.
-The example accumulo-env files are named based on the memory footprint for the 
-accumulo processes, and if that footprint is during standalone or cluster use. 
 Please note that the footprints are for only the Accumulo system processes, so 
 ample space should be left for other processes like hadoop, zookeeper, and the 
 accumulo client code.  These directories must be at the same location on every 
 node in the cluster.
 
-Note that zookeeper must be installed on every machine, but it should not be 
-run on every machine.
+If you are configuring a larger cluster you will need to create the configuration
+files yourself and propogate the changes to the $ACCUMULO_HOME/conf directories:
+
+   Create a "slaves" file in $ACCUMULO_HOME/conf/.  This is a list of machines
+   where tablet servers and loggers will run.
+
+   Create a "masters" file in $ACCUMULO_HOME/conf/.  This is a list of
+   machines where the master server will run. 
+
+   Create conf/accumulo-env.sh following the template of
+   example/3GB/native-standalone/accumulo-env.sh.  
+
+However you create your configuration files, you will need to set 
+JAVA_HOME, HADOOP_HOME, and ZOOKEEPER_HOME in conf/accumulo-env.sh
+
+Note that zookeeper client jar files must be installed on every machine, but 
+the server should not be run on every machine.
 
 Create the $ACCUMULO_LOG_DIR on every machine in the slaves file.
 
@@ -95,10 +111,14 @@ sure their heap space settings fit withi
 instances are also time sensitive and should be on machines that will not be
 heavily loaded, or over-subscribed for memory.
 
-Create conf/accumulo-site.xml.  You must set the zookeeper servers in this
+Edit conf/accumulo-site.xml.  You must set the zookeeper servers in this
 file (instance.zookeeper.host).  Look at docs/config.html to see what
 additional variables you can modify and what the defaults are.
 
+It is advisable to change the instance secret (instance.secret) to some new
+value.  Also ensure that the accumulo-site.xml file is not readable by other
+users on the machine.
+
 Create the write-ahead log directory on all slaves.  The directory is set in 
 the accumulo-site.xml as the "logger.dir.walog" parameter.  It is a local 
 directory that will be used to log updates which will be used in the event of

Modified: incubator/accumulo/trunk/bin/accumulo
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/bin/accumulo?rev=1300192&r1=1300191&r2=1300192&view=diff
==============================================================================
--- incubator/accumulo/trunk/bin/accumulo (original)
+++ incubator/accumulo/trunk/bin/accumulo Tue Mar 13 15:32:49 2012
@@ -84,15 +84,15 @@ fi
 XML_FILES=${ACCUMULO_HOME}/conf
 CLASSPATH=${XML_FILES}:${START_JAR}:${COMMONS_JCI_JARS}
 
-if [ -z $JAVA_HOME ] || [ ! -d $JAVA_HOME ]; then
+if [ -z $JAVA_HOME -o ! -d $JAVA_HOME ]; then
     echo "JAVA_HOME is not set.  Please make sure it's set globally or in conf/accumulo-env.sh"
     exit 1
 fi
-if [ -z $HADOOP_HOME ] || [ ! -d $HADOOP_HOME ]; then
+if [ -z $HADOOP_HOME -o ! -d $HADOOP_HOME ]; then
     echo "HADOOP_HOME is not set.  Please make sure it's set globally or in conf/accumulo-env.sh"
     exit 1
 fi
-if [ -z $ZOOKEEPER_HOME ] || [ ! -d $ZOOKEEPER_HOME ]; then
+if [ -z $ZOOKEEPER_HOME -o ! -d $ZOOKEEPER_HOME ]; then
     echo "ZOOKEEPER_HOME is not set.  Please make sure it's set globally or in conf/accumulo-env.sh"
     exit 1
 fi

Modified: incubator/accumulo/trunk/bin/config.sh
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/bin/config.sh?rev=1300192&r1=1300191&r2=1300192&view=diff
==============================================================================
--- incubator/accumulo/trunk/bin/config.sh (original)
+++ incubator/accumulo/trunk/bin/config.sh Tue Mar 13 15:32:49 2012
@@ -52,7 +52,7 @@ fi
 if [ -z "$HADOOP_HOME" ]
 then
    HADOOP_HOME="`which hadoop`"
-   if [ -z "$HADOOP_HOME" ]
+   if [ -z "$HADOOP_HOME"]
    then
       echo "You must set HADOOP_HOME"
       exit 1
@@ -60,6 +60,11 @@ then
    HADOOP_HOME=`dirname $HADOOP_HOME`
    HADOOP_HOME=`dirname $HADOOP_HOME`
 fi
+if [ ! -d "$HADOOP_HOME" ]
+then
+    echo "$HADOOP_HOME is not a directory"
+    exit 1
+fi
 export HADOOP_HOME
 
 if [ "`$HADOOP_HOME/bin/hadoop version 2>/dev/null | head -1 | cut -f 2 -d .`" != 20 ];
then

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/util/Initialize.java?rev=1300192&r1=1300191&r2=1300192&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
(original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
Tue Mar 13 15:32:49 2012
@@ -123,9 +123,11 @@ public class Initialize {
       c.printNewline();
       c.printNewline();
       c.printNewline();
-      c.printString("You can change the instance secret in accumulo by using: bin/accumulo
"
-          + org.apache.accumulo.server.util.ChangeSecret.class.getName()
-          + " oldPassword newPassword. You will also need to edit your secret in your configuration
file by adding the property instance.secret to your conf/accumulo-site.xml. Without this accumulo
will not operate correctly");
+      c.printString("You can change the instance secret in accumulo by using:");
+      c.printNewline();
+      c.printString("   bin/accumulo " + org.apache.accumulo.server.util.ChangeSecret.class.getName()
+ " oldPassword newPassword.");
+      c.printNewline();
+      c.printString("You will also need to edit your secret in your configuration file by
adding the property instance.secret to your conf/accumulo-site.xml. Without this accumulo
will not operate correctly");
       c.printNewline();
     }
     

Modified: incubator/accumulo/trunk/src/start/src/test/java/org/apache/accumulo/start/Test.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/start/src/test/java/org/apache/accumulo/start/Test.java?rev=1300192&r1=1300191&r2=1300192&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/start/src/test/java/org/apache/accumulo/start/Test.java (original)
+++ incubator/accumulo/trunk/src/start/src/test/java/org/apache/accumulo/start/Test.java Tue
Mar 13 15:32:49 2012
@@ -180,8 +180,9 @@ public class Test extends TestCase {
   }
   
   public void testChangingDirectory() throws Exception {
-    String configFile = System.getProperty("org.apache.accumulo.config.file", "accumulo-site.xml.1GBstandalone-example");
-    String SITE_CONF = System.getenv("ACCUMULO_HOME") + "/conf/" + configFile;
+    String configFile = System.getProperty("org.apache.accumulo.config.file", "accumulo-site.xml");
+    String CONF_DIR = System.getenv("ACCUMULO_HOME") + "/conf/";
+    String SITE_CONF = CONF_DIR + configFile;
     File oldConf = new File(SITE_CONF);
     boolean exists = oldConf.exists();
     String siteBkp = SITE_CONF + ".bkp";
@@ -202,7 +203,7 @@ public class Test extends TestCase {
       if (exists)
         d = db.parse(siteBkp);
       else
-        d = db.parse(new File(SITE_CONF + ".512MBBstandalone-example"));
+        d = db.parse(new File(CONF_DIR + "examples/512MB/standalone/" + configFile));
       
       NodeList pnodes = d.getElementsByTagName("property");
       for (int i = pnodes.getLength() - 1; i >= 0; i--) {



Mime
View raw message