zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From f..@apache.org
Subject svn commit: r1528221 - in /zookeeper/branches/branch-3.4: CHANGES.txt bin/zkEnv.sh
Date Tue, 01 Oct 2013 21:30:43 GMT
Author: fpj
Date: Tue Oct  1 21:30:42 2013
New Revision: 1528221

URL: http://svn.apache.org/r1528221
Log:
ZOOKEEPER-1670. zookeeper should set a default value for SERVER_JVMFLAGS and CLIENT_JVMFLAGS
so that memory usage is controlled (reverted)


Modified:
    zookeeper/branches/branch-3.4/CHANGES.txt
    zookeeper/branches/branch-3.4/bin/zkEnv.sh

Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1528221&r1=1528220&r2=1528221&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Tue Oct  1 21:30:42 2013
@@ -88,8 +88,6 @@ BUGFIXES:
 
   ZOOKEEPER-1379. 'printwatches, redo, history and connect '. client commands always print
usage. This is not necessary (edward via fpj)
 
-  ZOOKEEPER-1670: zookeeper should set a default value for SERVER_JVMFLAGS and CLIENT_JVMFLAGS
so that memory usage is controlled (Arpit Gupta via fpj)
-
   ZOOKEEPER-1448: Node+Quota creation in transaction log can crash leader startup (Botond
Hejj via fpj) 
  
   ZOOKEEPER-1664. Kerberos auth doesn't work with native platform GSS integration. (Boaz
Kelmer via camille) 

Modified: zookeeper/branches/branch-3.4/bin/zkEnv.sh
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/bin/zkEnv.sh?rev=1528221&r1=1528220&r2=1528221&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/bin/zkEnv.sh (original)
+++ zookeeper/branches/branch-3.4/bin/zkEnv.sh Tue Oct  1 21:30:42 2013
@@ -112,12 +112,4 @@ then
     CLASSPATH=`cygpath -wp "$CLASSPATH"`
 fi
 
-#echo "CLASSPATH=$CLASSPATH"
-
-# default heap for zookeeper server
-ZK_SERVER_HEAP="${ZK_SERVER_HEAP:-1000}"
-export SERVER_JVMFLAGS="-Xmx${ZK_SERVER_HEAP}m $SERVER_JVMFLAGS"
-
-# default heap for zookeeper client
-ZK_CLIENT_HEAP="${ZK_CLIENT_HEAP:-256}"
-export CLIENT_JVMFLAGS="-Xmx${ZK_CLIENT_HEAP}m $CLIENT_JVMFLAGS"
+#echo "CLASSPATH=$CLASSPATH"
\ No newline at end of file



Mime
View raw message