You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by ja...@apache.org on 2014/05/28 18:53:00 UTC
[4/7] git commit: DRILL-843: Drillbit goes down after running a large
number of queries in a series
DRILL-843: Drillbit goes down after running a large number of queries in a series
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/06de999e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/06de999e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/06de999e
Branch: refs/heads/master
Commit: 06de999eb51bbba286b7a6441ed517f737a4529f
Parents: 6dd3ff9
Author: Aditya Kishore <ad...@maprtech.com>
Authored: Tue May 27 22:37:38 2014 -0700
Committer: Jacques Nadeau <ja...@apache.org>
Committed: Wed May 28 09:15:28 2014 -0700
----------------------------------------------------------------------
distribution/src/resources/drill-env.sh | 6 +++++-
distribution/src/resources/runbit | 4 +++-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/06de999e/distribution/src/resources/drill-env.sh
----------------------------------------------------------------------
diff --git a/distribution/src/resources/drill-env.sh b/distribution/src/resources/drill-env.sh
index d9fdb6f..23bd8cb 100644
--- a/distribution/src/resources/drill-env.sh
+++ b/distribution/src/resources/drill-env.sh
@@ -15,4 +15,8 @@
DRILL_MAX_DIRECT_MEMORY="8G"
DRILL_INIT_HEAP="1g"
DRILL_MAX_HEAP="4g"
-export DRILL_JAVA_OPTS="-Xms$DRILL_INIT_HEAP -Xmx$DRILL_MAX_HEAP -XX:MaxDirectMemorySize=$DRILL_MAX_DIRECT_MEMORY"
+export DRILL_JAVA_OPTS="-Xms$DRILL_INIT_HEAP -Xmx$DRILL_MAX_HEAP -XX:MaxDirectMemorySize=$DRILL_MAX_DIRECT_MEMORY -XX:+UseConcMarkSweepGC"
+
+# Class unloading is disabled by default in Java 7
+# http://hg.openjdk.java.net/jdk7u/jdk7u60/hotspot/file/tip/src/share/vm/runtime/globals.hpp#l1622
+export SERVER_GC_OPTS="-XX:+CMSClassUnloadingEnabled"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/06de999e/distribution/src/resources/runbit
----------------------------------------------------------------------
diff --git a/distribution/src/resources/runbit b/distribution/src/resources/runbit
index 657e701..a8d8de8 100755
--- a/distribution/src/resources/runbit
+++ b/distribution/src/resources/runbit
@@ -20,4 +20,6 @@ bin=`cd "$bin">/dev/null; pwd`
. "$bin"/drill-config.sh
-exec $JAVA -Dlog.path=$DRILLBIT_LOG_PATH $DRILLBIT_JAVA_OPTS $DRILL_JAVA_OPTS -cp $CP org.apache.drill.exec.server.Drillbit
+DRILL_ALL_JAVA_OPTS="$DRILLBIT_JAVA_OPTS $DRILL_JAVA_OPTS $SERVER_GC_OPTS"
+
+exec $JAVA -Dlog.path=$DRILLBIT_LOG_PATH $DRILL_ALL_JAVA_OPTS -cp $CP org.apache.drill.exec.server.Drillbit