accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject accumulo git commit: ACCUMULO-2917 Accumulo shell remote debugger settings.
Date Thu, 09 Jul 2015 22:16:39 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master 064f22272 -> e057f1a14


ACCUMULO-2917 Accumulo shell remote debugger settings.

Signed-off-by: Josh Elser <elserj@apache.org>


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

Branch: refs/heads/master
Commit: e057f1a143be5383def65b4bfabdd04fdacb220d
Parents: 064f222
Author: dallaybatta <vickykak@gmail.com>
Authored: Thu Jul 9 18:14:37 2015 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Thu Jul 9 18:15:14 2015 -0400

----------------------------------------------------------------------
 assemble/bin/accumulo                   | 1 +
 assemble/bin/bootstrap_config.sh        | 6 ++++++
 assemble/conf/templates/accumulo-env.sh | 1 +
 3 files changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e057f1a1/assemble/bin/accumulo
----------------------------------------------------------------------
diff --git a/assemble/bin/accumulo b/assemble/bin/accumulo
index 6e30c95..1bfaaad 100755
--- a/assemble/bin/accumulo
+++ b/assemble/bin/accumulo
@@ -107,6 +107,7 @@ master)  export ACCUMULO_OPTS="${ACCUMULO_GENERAL_OPTS} ${ACCUMULO_MASTER_OPTS}"
 gc)      export ACCUMULO_OPTS="${ACCUMULO_GENERAL_OPTS} ${ACCUMULO_GC_OPTS}" ;;
 tserver) export ACCUMULO_OPTS="${ACCUMULO_GENERAL_OPTS} ${ACCUMULO_TSERVER_OPTS}" ;;
 monitor) export ACCUMULO_OPTS="${ACCUMULO_GENERAL_OPTS} ${ACCUMULO_MONITOR_OPTS}" ;;
+shell)   export ACCUMULO_OPTS="${ACCUMULO_GENERAL_OPTS} ${ACCUMULO_SHELL_OPTS}" ;;
 *)       export ACCUMULO_OPTS="${ACCUMULO_GENERAL_OPTS} ${ACCUMULO_OTHER_OPTS}" ;;
 esac
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e057f1a1/assemble/bin/bootstrap_config.sh
----------------------------------------------------------------------
diff --git a/assemble/bin/bootstrap_config.sh b/assemble/bin/bootstrap_config.sh
index f6eb4d1..f178864 100755
--- a/assemble/bin/bootstrap_config.sh
+++ b/assemble/bin/bootstrap_config.sh
@@ -134,6 +134,7 @@ _1GB_master="-Xmx128m -Xms128m"
 _1GB_monitor="-Xmx64m -Xms64m"
 _1GB_gc="-Xmx64m -Xms64m"
 _1GB_other="-Xmx128m -Xms64m"
+_1GB_shell="${_1GB_other}"
 
 _1GB_memoryMapMax="256M"
 native_1GB_nativeEnabled="true"
@@ -148,6 +149,7 @@ _2GB_master="-Xmx256m -Xms256m"
 _2GB_monitor="-Xmx128m -Xms64m"
 _2GB_gc="-Xmx128m -Xms128m"
 _2GB_other="-Xmx256m -Xms64m"
+_2GB_shell="${_2GB_other}"
 
 _2GB_memoryMapMax="512M"
 native_2GB_nativeEnabled="true"
@@ -162,6 +164,7 @@ _3GB_master="-Xmx1g -Xms1g"
 _3GB_monitor="-Xmx1g -Xms256m"
 _3GB_gc="-Xmx256m -Xms256m"
 _3GB_other="-Xmx1g -Xms256m"
+_3GB_shell="${_3GB_other}"
 
 _3GB_memoryMapMax="1G"
 native_3GB_nativeEnabled="true"
@@ -176,6 +179,7 @@ _512MB_master="-Xmx128m -Xms128m"
 _512MB_monitor="-Xmx64m -Xms64m"
 _512MB_gc="-Xmx64m -Xms64m"
 _512MB_other="-Xmx128m -Xms64m"
+_512MB_shell="${_512MB_other}"
 
 _512MB_memoryMapMax="80M"
 native_512MB_nativeEnabled="true"
@@ -275,6 +279,7 @@ TSERVER="${TYPE}_${SIZE}_tServer"
 MASTER="_${SIZE}_master"
 MONITOR="_${SIZE}_monitor"
 GC="_${SIZE}_gc"
+SHELL="_${SIZE}_shell"
 OTHER="_${SIZE}_other"
 
 MEMORY_MAP_MAX="_${SIZE}_memoryMapMax"
@@ -296,6 +301,7 @@ sed -e "s/\${tServerHigh_tServerLow}/${!TSERVER}/" \
     -e "s/\${masterHigh_masterLow}/${!MASTER}/" \
     -e "s/\${monitorHigh_monitorLow}/${!MONITOR}/" \
     -e "s/\${gcHigh_gcLow}/${!GC}/" \
+    -e "s/\${shellHigh_shellLow}/${!SHELL}/" \
     -e "s/\${otherHigh_otherLow}/${!OTHER}/" \
     ${TEMPLATE_CONF_DIR}/$ACCUMULO_ENV > ${CONF_DIR}/$ACCUMULO_ENV
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e057f1a1/assemble/conf/templates/accumulo-env.sh
----------------------------------------------------------------------
diff --git a/assemble/conf/templates/accumulo-env.sh b/assemble/conf/templates/accumulo-env.sh
index 8a9ff15..205bd6c 100644
--- a/assemble/conf/templates/accumulo-env.sh
+++ b/assemble/conf/templates/accumulo-env.sh
@@ -48,6 +48,7 @@ test -z "$ACCUMULO_TSERVER_OPTS" && export ACCUMULO_TSERVER_OPTS="${POLICY}
${tS
 test -z "$ACCUMULO_MASTER_OPTS"  && export ACCUMULO_MASTER_OPTS="${POLICY} ${masterHigh_masterLow}"
 test -z "$ACCUMULO_MONITOR_OPTS" && export ACCUMULO_MONITOR_OPTS="${POLICY} ${monitorHigh_monitorLow}"
 test -z "$ACCUMULO_GC_OPTS"      && export ACCUMULO_GC_OPTS="${gcHigh_gcLow}"
+test -z "$ACCUMULO_SHELL_OPTS"   && export ACCUMULO_SHELL_OPTS="${shellHigh_shellLow}"
 test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC
-XX:CMSInitiatingOccupancyFraction=75 -Djava.net.preferIPv4Stack=true"
 test -z "$ACCUMULO_OTHER_OPTS"   && export ACCUMULO_OTHER_OPTS="${otherHigh_otherLow}"
 test -z "${ACCUMULO_PID_DIR}"    && export ACCUMULO_PID_DIR="${ACCUMULO_HOME}/run"


Mime
View raw message