accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [2/3] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Date Mon, 09 Dec 2013 02:52:24 GMT
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	conf/examples/1GB/native-standalone/accumulo-env.sh
	conf/examples/1GB/standalone/accumulo-env.sh
	conf/examples/2GB/native-standalone/accumulo-env.sh
	conf/examples/2GB/standalone/accumulo-env.sh
	conf/examples/3GB/native-standalone/accumulo-env.sh
	conf/examples/3GB/standalone/accumulo-env.sh
	conf/examples/512MB/native-standalone/accumulo-env.sh
	conf/examples/512MB/standalone/accumulo-env.sh


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9ae34e09
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9ae34e09
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9ae34e09

Branch: refs/heads/master
Commit: 9ae34e0904ec92a18be8da99c7d65b1fccb3e93a
Parents: 7fb59e9 7655de6
Author: Josh Elser <elserj@apache.org>
Authored: Sun Dec 8 21:47:22 2013 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Sun Dec 8 21:47:22 2013 -0500

----------------------------------------------------------------------
 bin/config.sh                                         |  3 +++
 bin/start-server.sh                                   | 10 ++++++++--
 conf/examples/1GB/native-standalone/accumulo-env.sh   |  3 +++
 conf/examples/1GB/standalone/accumulo-env.sh          |  3 +++
 conf/examples/2GB/native-standalone/accumulo-env.sh   |  3 +++
 conf/examples/2GB/standalone/accumulo-env.sh          |  3 +++
 conf/examples/3GB/native-standalone/accumulo-env.sh   |  3 +++
 conf/examples/3GB/standalone/accumulo-env.sh          |  3 +++
 conf/examples/512MB/native-standalone/accumulo-env.sh |  3 +++
 conf/examples/512MB/standalone/accumulo-env.sh        |  3 +++
 10 files changed, 35 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ae34e09/bin/config.sh
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ae34e09/bin/start-server.sh
----------------------------------------------------------------------
diff --cc bin/start-server.sh
index c26a1a4,f5fd33a..08c5126
--- a/bin/start-server.sh
+++ b/bin/start-server.sh
@@@ -59,13 -64,13 +65,13 @@@ els
     PID=$($SSH $HOST ps -ef | egrep ${ACCUMULO_HOME}/.*/accumulo.*.jar | grep "Main $SERVICE"
| grep -v grep | awk {'print $2'} | head -1)
  fi
  
 -if [ -z $PID ]; then
 +if [ -z "$PID" ]; then
     echo "Starting $LONGNAME on $HOST"
     if [ "$HOST" = "localhost" -o "$HOST" = "`hostname`" -o "$HOST" = "$ip" ]; then
-       ${bin}/accumulo ${SERVICE} --address $1 >${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out
2>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err & 
+       ${bin}/accumulo ${SERVICE} --address ${ADDRESS} >${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out
2>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err & 
        MAX_FILES_OPEN=$(ulimit -n)
     else
-       $SSH $HOST "bash -c 'exec nohup ${bin}/accumulo ${SERVICE} --address $1 >${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out
2>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err' &"
+       $SSH $HOST "bash -c 'exec nohup ${bin}/accumulo ${SERVICE} --address ${ADDRESS} >${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out
2>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err' &"
        MAX_FILES_OPEN=$($SSH $HOST "/usr/bin/env bash -c 'ulimit -n'") 
     fi
  

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ae34e09/conf/examples/1GB/native-standalone/accumulo-env.sh
----------------------------------------------------------------------
diff --cc conf/examples/1GB/native-standalone/accumulo-env.sh
index aa5d71a,c683521..251a19c
--- a/conf/examples/1GB/native-standalone/accumulo-env.sh
+++ b/conf/examples/1GB/native-standalone/accumulo-env.sh
@@@ -57,8 -56,5 +57,11 @@@ export ACCUMULO_LOG_HOST=`(grep -v '^#
  # what do when the JVM runs out of heap memory
  export ACCUMULO_KILL_CMD='kill -9 %p'
  
 +### Optionally look for hadoop and accumulo native libraries for your
 +### platform in additional directories. (Use DYLD_LIBRARY_PATH on Mac OS X.)
 +### May not be necessary for Hadoop 2.x or using an RPM that installs to
 +### the correct system library directory.
 +# export LD_LIBRARY_PATH=${HADOOP_PREFIX}/lib/native/${PLATFORM}:${LD_LIBRARY_PATH}
++
+ # Should the monitor bind to all network interfaces -- default: false
+ # export ACCUMULO_MONITOR_BIND_ALL="true"

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ae34e09/conf/examples/1GB/standalone/accumulo-env.sh
----------------------------------------------------------------------
diff --cc conf/examples/1GB/standalone/accumulo-env.sh
index e2170b2,6fe9cf9..5252283
--- a/conf/examples/1GB/standalone/accumulo-env.sh
+++ b/conf/examples/1GB/standalone/accumulo-env.sh
@@@ -57,8 -56,5 +57,11 @@@ export ACCUMULO_LOG_HOST=`(grep -v '^#
  # what do when the JVM runs out of heap memory
  export ACCUMULO_KILL_CMD='kill -9 %p'
  
 +### Optionally look for hadoop and accumulo native libraries for your
 +### platform in additional directories. (Use DYLD_LIBRARY_PATH on Mac OS X.)
 +### May not be necessary for Hadoop 2.x or using an RPM that installs to
 +### the correct system library directory.
 +# export LD_LIBRARY_PATH=${HADOOP_PREFIX}/lib/native/${PLATFORM}:${LD_LIBRARY_PATH}
++
+ # Should the monitor bind to all network interfaces -- default: false
+ # export ACCUMULO_MONITOR_BIND_ALL="true"

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ae34e09/conf/examples/2GB/native-standalone/accumulo-env.sh
----------------------------------------------------------------------
diff --cc conf/examples/2GB/native-standalone/accumulo-env.sh
index 3d26002,bbad995..8beac8e
--- a/conf/examples/2GB/native-standalone/accumulo-env.sh
+++ b/conf/examples/2GB/native-standalone/accumulo-env.sh
@@@ -56,8 -55,5 +56,11 @@@ export ACCUMULO_LOG_HOST=`(grep -v '^#
  # what do when the JVM runs out of heap memory
  export ACCUMULO_KILL_CMD='kill -9 %p'
  
 +### Optionally look for hadoop and accumulo native libraries for your
 +### platform in additional directories. (Use DYLD_LIBRARY_PATH on Mac OS X.)
 +### May not be necessary for Hadoop 2.x or using an RPM that installs to
 +### the correct system library directory.
 +# export LD_LIBRARY_PATH=${HADOOP_PREFIX}/lib/native/${PLATFORM}:${LD_LIBRARY_PATH}
++
+ # Should the monitor bind to all network interfaces -- default: false
+ # export ACCUMULO_MONITOR_BIND_ALL="true"

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ae34e09/conf/examples/2GB/standalone/accumulo-env.sh
----------------------------------------------------------------------
diff --cc conf/examples/2GB/standalone/accumulo-env.sh
index 8325daf,b9c14e0..1e7925d
--- a/conf/examples/2GB/standalone/accumulo-env.sh
+++ b/conf/examples/2GB/standalone/accumulo-env.sh
@@@ -57,8 -56,5 +57,11 @@@ export ACCUMULO_LOG_HOST=`(grep -v '^#
  # what do when the JVM runs out of heap memory
  export ACCUMULO_KILL_CMD='kill -9 %p'
  
 +### Optionally look for hadoop and accumulo native libraries for your
 +### platform in additional directories. (Use DYLD_LIBRARY_PATH on Mac OS X.)
 +### May not be necessary for Hadoop 2.x or using an RPM that installs to
 +### the correct system library directory.
 +# export LD_LIBRARY_PATH=${HADOOP_PREFIX}/lib/native/${PLATFORM}:${LD_LIBRARY_PATH}
++
+ # Should the monitor bind to all network interfaces -- default: false
+ # export ACCUMULO_MONITOR_BIND_ALL="true"

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ae34e09/conf/examples/3GB/native-standalone/accumulo-env.sh
----------------------------------------------------------------------
diff --cc conf/examples/3GB/native-standalone/accumulo-env.sh
index 34e17fd,a28892a..85ed990
--- a/conf/examples/3GB/native-standalone/accumulo-env.sh
+++ b/conf/examples/3GB/native-standalone/accumulo-env.sh
@@@ -56,8 -55,5 +56,11 @@@ export ACCUMULO_LOG_HOST=`(grep -v '^#
  # what do when the JVM runs out of heap memory
  export ACCUMULO_KILL_CMD='kill -9 %p'
  
 +### Optionally look for hadoop and accumulo native libraries for your
 +### platform in additional directories. (Use DYLD_LIBRARY_PATH on Mac OS X.)
 +### May not be necessary for Hadoop 2.x or using an RPM that installs to
 +### the correct system library directory.
 +# export LD_LIBRARY_PATH=${HADOOP_PREFIX}/lib/native/${PLATFORM}:${LD_LIBRARY_PATH}
++
+ # Should the monitor bind to all network interfaces -- default: false
+ # export ACCUMULO_MONITOR_BIND_ALL="true"

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ae34e09/conf/examples/3GB/standalone/accumulo-env.sh
----------------------------------------------------------------------
diff --cc conf/examples/3GB/standalone/accumulo-env.sh
index 6c786b6,0c3672b..73ab794
--- a/conf/examples/3GB/standalone/accumulo-env.sh
+++ b/conf/examples/3GB/standalone/accumulo-env.sh
@@@ -56,8 -55,5 +56,11 @@@ export ACCUMULO_LOG_HOST=`(grep -v '^#
  # what do when the JVM runs out of heap memory
  export ACCUMULO_KILL_CMD='kill -9 %p'
  
 +### Optionally look for hadoop and accumulo native libraries for your
 +### platform in additional directories. (Use DYLD_LIBRARY_PATH on Mac OS X.)
 +### May not be necessary for Hadoop 2.x or using an RPM that installs to
 +### the correct system library directory.
 +# export LD_LIBRARY_PATH=${HADOOP_PREFIX}/lib/native/${PLATFORM}:${LD_LIBRARY_PATH}
++
+ # Should the monitor bind to all network interfaces -- default: false
+ # export ACCUMULO_MONITOR_BIND_ALL="true"

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ae34e09/conf/examples/512MB/native-standalone/accumulo-env.sh
----------------------------------------------------------------------
diff --cc conf/examples/512MB/native-standalone/accumulo-env.sh
index 988fe7c,7f32213..74b9f00
--- a/conf/examples/512MB/native-standalone/accumulo-env.sh
+++ b/conf/examples/512MB/native-standalone/accumulo-env.sh
@@@ -56,8 -55,5 +56,11 @@@ export ACCUMULO_LOG_HOST=`(grep -v '^#
  # what do when the JVM runs out of heap memory
  export ACCUMULO_KILL_CMD='kill -9 %p'
  
 +### Optionally look for hadoop and accumulo native libraries for your
 +### platform in additional directories. (Use DYLD_LIBRARY_PATH on Mac OS X.)
 +### May not be necessary for Hadoop 2.x or using an RPM that installs to
 +### the correct system library directory.
 +# export LD_LIBRARY_PATH=${HADOOP_PREFIX}/lib/native/${PLATFORM}:${LD_LIBRARY_PATH}
++
+ # Should the monitor bind to all network interfaces -- default: false
+ # export ACCUMULO_MONITOR_BIND_ALL="true"

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ae34e09/conf/examples/512MB/standalone/accumulo-env.sh
----------------------------------------------------------------------
diff --cc conf/examples/512MB/standalone/accumulo-env.sh
index de07c9f,a4c95fc..a1ca644
--- a/conf/examples/512MB/standalone/accumulo-env.sh
+++ b/conf/examples/512MB/standalone/accumulo-env.sh
@@@ -56,8 -55,5 +56,11 @@@ export ACCUMULO_LOG_HOST=`(grep -v '^#
  # what do when the JVM runs out of heap memory
  export ACCUMULO_KILL_CMD='kill -9 %p'
  
 +### Optionally look for hadoop and accumulo native libraries for your
 +### platform in additional directories. (Use DYLD_LIBRARY_PATH on Mac OS X.)
 +### May not be necessary for Hadoop 2.x or using an RPM that installs to
 +### the correct system library directory.
 +# export LD_LIBRARY_PATH=${HADOOP_PREFIX}/lib/native/${PLATFORM}:${LD_LIBRARY_PATH}
++
+ # Should the monitor bind to all network interfaces -- default: false
+ # export ACCUMULO_MONITOR_BIND_ALL="true"


Mime
View raw message