From acbb185e5932e284051e629e1fe24ebf22ad054a Mon Sep 17 00:00:00 2001
From: Ashwanth Fernando <afernando@walmart.com>
Date: Mon, 8 Jul 2013 16:25:48 -0700
Subject: [PATCH] 718 patch

---
 bin/kafka-run-class.sh        |   50 ++++++++++++++++++++++++++++++++---------
 bin/kafka-server-start.sh     |    2 +-
 bin/zookeeper-server-start.sh |    3 +-
 3 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/bin/kafka-run-class.sh b/bin/kafka-run-class.sh
index 978447d..05aae94 100755
--- a/bin/kafka-run-class.sh
+++ b/bin/kafka-run-class.sh
@@ -22,26 +22,42 @@ fi
 
 base_dir=$(dirname $0)/..
 
-SCALA_VERSION=2.8.0
 
-# assume all dependencies have been packaged into one jar with sbt-assembly's task "assembly-package-dependency"
-for file in $base_dir/core/target/scala-2.8.0/*.jar;
-do
-  CLASSPATH=$CLASSPATH:$file
-done
+USER_HOME=$(eval echo ~${USER})
+ivyPath=$(echo "$USER_HOME/.ivy2/cache")
+
+snappy=$(echo "$ivyPath/org.xerial.snappy/snappy-java/bundles/snappy-java-1.0.4.1.jar")
+CLASSPATH=$CLASSPATH:$snappy
+
+library=$(echo "$ivyPath/org.scala-lang/scala-library/jars/scala-library-2.8.0.jar")
+CLASSPATH=$CLASSPATH:$library
+
+compiler=~$(echo "$ivyPath/org.scala-lang/scala-compiler/jars/scala-compiler-2.8.0.jar")
+CLASSPATH=$CLASSPATH:$compiler
+
+log4j=$(echo "$ivyPath/log4j/log4j/jars/log4j-1.2.15.jar")
+CLASSPATH=$CLASSPATH:$log4j
 
-for file in $base_dir/perf/target/scala-${SCALA_VERSION}/kafka*.jar;
+slf=$(echo "$ivyPath/org.slf4j/slf4j-api/jars/slf4j-api-1.6.4.jar")
+CLASSPATH=$CLASSPATH:$slf
+
+zookeeper=$(echo "$ivyPath/org.apache.zookeeper/zookeeper/jars/zookeeper-3.3.4.jar")
+CLASSPATH=$CLASSPATH:$zookeeper
+
+jopt=$(echo "$ivyPath/net.sf.jopt-simple/jopt-simple/jars/jopt-simple-3.2.jar")
+CLASSPATH=$CLASSPATH:$jopt
+
+for file in $base_dir/core/target/scala-2.8.0/*.jar;
 do
   CLASSPATH=$CLASSPATH:$file
 done
 
-# classpath addition for release
-for file in $base_dir/libs/*.jar;
+for file in $base_dir/core/lib/*.jar;
 do
   CLASSPATH=$CLASSPATH:$file
 done
 
-for file in $base_dir/kafka*.jar;
+for file in $base_dir/perf/target/scala-2.8.0/kafka*.jar;
 do
   CLASSPATH=$CLASSPATH:$file
 done
@@ -64,4 +80,16 @@ else
   JAVA="$JAVA_HOME/bin/java"
 fi
 
-$JAVA $KAFKA_OPTS $KAFKA_JMX_OPTS -cp $CLASSPATH "$@"
+GC_FILE_SUFFIX='_gc.log'
+GC_LOG_FILE_NAME=''
+JVM_PERFORMANCE_OPTS="-XX:+AggressiveOpts -XX:+UseCompressedOops -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -XX:+CMSScavengeBeforeRemark -XX:+DisableExplicitGC"
+
+if [ "$1" = "isDaemon" ] ; then
+	shift
+        GC_LOG_FILE_NAME=$1$GC_FILE_SUFFIX
+        shift
+    	JVM_PERFORMANCE_OPTS="$JVM_PERFORMANCE_OPTS -Xloggc:$base_dir/$GC_LOG_FILE_NAME -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps"
+fi
+
+$JAVA $KAFKA_OPTS $KAFKA_JMX_OPTS $JVM_PERFORMANCE_OPTS -cp $CLASSPATH "$@"
+
diff --git a/bin/kafka-server-start.sh b/bin/kafka-server-start.sh
index 307f76c..eeae2df 100755
--- a/bin/kafka-server-start.sh
+++ b/bin/kafka-server-start.sh
@@ -22,4 +22,4 @@ fi
 
 export JMX_PORT=${JMX_PORT:-9999}
 
-$(dirname $0)/kafka-run-class.sh kafka.Kafka $@
+$(dirname $0)/kafka-run-class.sh isDaemon kafkaServer kafka.Kafka $@
diff --git a/bin/zookeeper-server-start.sh b/bin/zookeeper-server-start.sh
index 184a10b..b3a75a9 100755
--- a/bin/zookeeper-server-start.sh
+++ b/bin/zookeeper-server-start.sh
@@ -20,4 +20,5 @@ then
 	exit 1
 fi
 
-$(dirname $0)/kafka-run-class.sh org.apache.zookeeper.server.quorum.QuorumPeerMain $@
+$(dirname $0)/kafka-run-class.sh isDaemon zookeeper org.apache.zookeeper.server.quorum.QuorumPeerMain $@
+
-- 
1.7.5.4