Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1655320049C for ; Fri, 11 Aug 2017 22:08:41 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 14BD116DF71; Fri, 11 Aug 2017 20:08:41 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5AA3B16DF70 for ; Fri, 11 Aug 2017 22:08:40 +0200 (CEST) Received: (qmail 21889 invoked by uid 500); 11 Aug 2017 20:08:34 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 21871 invoked by uid 99); 11 Aug 2017 20:08:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Aug 2017 20:08:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A4590F5524; Fri, 11 Aug 2017 20:08:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: apurtell@apache.org To: commits@hbase.apache.org Date: Fri, 11 Aug 2017 20:08:35 -0000 Message-Id: In-Reply-To: <199212fcec494dabab8d7407648de1d0@git.apache.org> References: <199212fcec494dabab8d7407648de1d0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/6] hbase git commit: HBASE-18479 should apply HBASE-18255 to HBASE_MASTER_OPTS too archived-at: Fri, 11 Aug 2017 20:08:41 -0000 HBASE-18479 should apply HBASE-18255 to HBASE_MASTER_OPTS too Signed-off-by: tedyu Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1ce51032 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1ce51032 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1ce51032 Branch: refs/heads/branch-1.4 Commit: 1ce510322b712f3f5b6c2239a85f6df5dffcac91 Parents: 8ca1bf9 Author: chenyechao Authored: Sun Jul 30 14:07:38 2017 +0800 Committer: Andrew Purtell Committed: Fri Aug 11 13:08:28 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/1ce51032/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/1ce51032/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.