Repository: hbase Updated Branches: refs/heads/branch-1 d0682d19f -> c78243af6
HBASE-13165 Fix docs and scripts for default max heaps size after HBASE-11804 (code) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c78243af Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c78243af Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c78243af Branch: refs/heads/branch-1 Commit: c78243af6135cabbac30fb3d91d8803b7df2877b Parents: d0682d1 Author: Lars George <larsgeo...@apache.org> Authored: Wed Mar 11 11:16:10 2015 +0100 Committer: Lars George <larsgeo...@apache.org> Committed: Wed Mar 11 11:20:56 2015 +0100 ---------------------------------------------------------------------- bin/hbase | 5 +++-- bin/hbase.cmd | 5 +++-- conf/hbase-env.cmd | 5 +++-- conf/hbase-env.sh | 12 +++++------- 4 files changed, 14 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/c78243af/bin/hbase ---------------------------------------------------------------------- diff --git a/bin/hbase b/bin/hbase index 3aebfa5..6430dc5 100755 --- a/bin/hbase +++ b/bin/hbase @@ -34,8 +34,9 @@ # HBASE_CLASSPATH_PREFIX Extra Java CLASSPATH entries that should be # prefixed to the system classpath. # -# HBASE_HEAPSIZE The maximum amount of heap to use, in MB. -# Default is 1000. +# HBASE_HEAPSIZE The maximum amount of heap to use. +# Default is unset and uses the JVMs default setting +# (usually 1/4th of the available memory). # # HBASE_LIBRARY_PATH HBase additions to JAVA_LIBRARY_PATH for adding # native libraries. http://git-wip-us.apache.org/repos/asf/hbase/blob/c78243af/bin/hbase.cmd ---------------------------------------------------------------------- diff --git a/bin/hbase.cmd b/bin/hbase.cmd index 01e1b07..91c2aab 100644 --- a/bin/hbase.cmd +++ b/bin/hbase.cmd @@ -28,8 +28,9 @@ @rem @rem HBASE_CLASSPATH Extra Java CLASSPATH entries. @rem -@rem HBASE_HEAPSIZE The maximum amount of heap to use, in MB. -@rem Default is 1000. +@rem HBASE_HEAPSIZE The maximum amount of heap to use. +@rem Default is unset and uses the JVMs default setting +@rem (usually 1/4th of the available memory). @rem @rem HBASE_OPTS Extra Java runtime options. @rem http://git-wip-us.apache.org/repos/asf/hbase/blob/c78243af/conf/hbase-env.cmd ---------------------------------------------------------------------- diff --git a/conf/hbase-env.cmd b/conf/hbase-env.cmd index bf7f25a..003d1b3 100644 --- a/conf/hbase-env.cmd +++ b/conf/hbase-env.cmd @@ -24,10 +24,11 @@ @rem Extra Java CLASSPATH elements. Optional. @rem set HBASE_CLASSPATH= -@rem The maximum amount of heap to use, in MB. Default is 1000. +@rem The maximum amount of heap to use. Default is left to JVM default. @rem set HBASE_HEAPSIZE=1000 -@rem Uncomment below if you intend to use off heap cache. +@rem Uncomment below if you intend to use off heap cache. For example, to allocate 8G of +@rem offheap, set the value to "8G". @rem set HBASE_OFFHEAPSIZE=1000 @rem For example, to allocate 8G of offheap, to 8G: http://git-wip-us.apache.org/repos/asf/hbase/blob/c78243af/conf/hbase-env.sh ---------------------------------------------------------------------- diff --git a/conf/hbase-env.sh b/conf/hbase-env.sh index 1693b17..2bbde1a 100644 --- a/conf/hbase-env.sh +++ b/conf/hbase-env.sh @@ -31,14 +31,12 @@ # Extra Java CLASSPATH elements. Optional. # export HBASE_CLASSPATH= -# The maximum amount of heap to use, in MB. Default is 1000. -# export HBASE_HEAPSIZE=1000 +# The maximum amount of heap to use. Default is left to JVM default. +# export HBASE_HEAPSIZE=1G -# Uncomment below if you intend to use off heap cache. -# export HBASE_OFFHEAPSIZE=1000 - -# For example, to allocate 8G of offheap, to 8G: -# export HBASE_OFFHEAPSIZE=8G +# Uncomment below if you intend to use off heap cache. For example, to allocate 8G of +# offheap, set the value to "8G". +# export HBASE_OFFHEAPSIZE=1G # Extra Java runtime options. # Below are what we set by default. May only work with SUN JVM.
