Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 11503fc6e -> 9f809748d


HBASE-18479 should apply HBASE-18255 to HBASE_MASTER_OPTS too

Signed-off-by: tedyu <yuzhih...@gmail.com>


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

Branch: refs/heads/branch-1.2
Commit: 9f809748d72b39489f202a56aba107cf7386f30c
Parents: 11503fc
Author: chenyechao <chenyec...@cmss.chinamobile.com>
Authored: Sun Jul 30 14:07:38 2017 +0800
Committer: tedyu <yuzhih...@gmail.com>
Committed: Thu Aug 10 19:24:52 2017 -0700

----------------------------------------------------------------------
 conf/hbase-env.cmd | 2 +-
 conf/hbase-env.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/9f809748/conf/hbase-env.cmd
----------------------------------------------------------------------
diff --git a/conf/hbase-env.cmd b/conf/hbase-env.cmd
index 2ffadbf..b10e934 100644
--- a/conf/hbase-env.cmd
+++ b/conf/hbase-env.cmd
@@ -43,7 +43,7 @@
 set HBASE_OPTS="-XX:+UseConcMarkSweepGC" "-Djava.net.preferIPv4Stack=true"
 
 @rem Configure PermSize. Only needed in JDK7. You can safely remove it for 
JDK8+
-set HBASE_MASTER_OPTS=%HBASE_MASTER_OPTS% "-XX:PermSize=128m" 
"-XX:MaxPermSize=128m"
+set HBASE_MASTER_OPTS=%HBASE_MASTER_OPTS% "-XX:PermSize=128m" 
"-XX:MaxPermSize=128m" "-XX:ReservedCodeCacheSize=256m"
 set HBASE_REGIONSERVER_OPTS=%HBASE_REGIONSERVER_OPTS% "-XX:PermSize=128m" 
"-XX:MaxPermSize=128m" "-XX:ReservedCodeCacheSize=256m"
 
 @rem Uncomment below to enable java garbage collection logging for the 
server-side processes

http://git-wip-us.apache.org/repos/asf/hbase/blob/9f809748/conf/hbase-env.sh
----------------------------------------------------------------------
diff --git a/conf/hbase-env.sh b/conf/hbase-env.sh
index 599a2f1..f2195da 100644
--- a/conf/hbase-env.sh
+++ b/conf/hbase-env.sh
@@ -43,7 +43,7 @@
 export HBASE_OPTS="-XX:+UseConcMarkSweepGC"
 
 # Configure PermSize. Only needed in JDK7. You can safely remove it for JDK8+
-export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS -XX:PermSize=128m 
-XX:MaxPermSize=128m"
+export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS -XX:PermSize=128m 
-XX:MaxPermSize=128m -XX:ReservedCodeCacheSize=256m"
 export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -XX:PermSize=128m 
-XX:MaxPermSize=128m -XX:ReservedCodeCacheSize=256m"
 
 # Uncomment one of the below three options to enable java garbage collection 
logging for the server-side processes.

Reply via email to