diff --git a/bin/hbase b/bin/hbase index 3aebfa5..23e3e0b 100755 --- a/bin/hbase +++ b/bin/hbase @@ -35,7 +35,8 @@ # prefixed to the system classpath. # # HBASE_HEAPSIZE The maximum amount of heap to use, in MB. -# Default is 1000. +# 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. diff --git a/conf/hbase-env.sh b/conf/hbase-env.sh index 1693b17..de39b1e 100644 --- a/conf/hbase-env.sh +++ b/conf/hbase-env.sh @@ -31,14 +31,11 @@ # 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, to "8G". +# export HBASE_OFFHEAPSIZE=1G # Extra Java runtime options. # Below are what we set by default. May only work with SUN JVM. diff --git a/src/main/asciidoc/_chapters/architecture.adoc b/src/main/asciidoc/_chapters/architecture.adoc index 6de7208..0869b93 100644 --- a/src/main/asciidoc/_chapters/architecture.adoc +++ b/src/main/asciidoc/_chapters/architecture.adoc @@ -682,7 +682,7 @@ The last value (99%) is the default acceptable loading factor in the LRU cache a The reason it is included in this equation is that it would be unrealistic to say that it is possible to use 100% of the available memory since this would make the process blocking from the point where it loads new blocks. Here are some examples: -* One region server with the default heap size (1 GB) and the default block cache size will have 253 MB of block cache available. +* One region server with the heap size set to 1 GB and the default block cache size will have 253 MB of block cache available. * 20 region servers with the heap size set to 8 GB and a default block cache size will have 39.6 of block cache. * 100 region servers with the heap size set to 24 GB and a block cache size of 0.5 will have about 1.16 TB of block cache. diff --git a/src/main/asciidoc/_chapters/configuration.adoc b/src/main/asciidoc/_chapters/configuration.adoc index 6f8858d..974b499 100644 --- a/src/main/asciidoc/_chapters/configuration.adoc +++ b/src/main/asciidoc/_chapters/configuration.adoc @@ -708,8 +708,8 @@ The following lines in the _hbase-env.sh_ file show how to set the `JAVA_HOME` e # The java implementation to use. export JAVA_HOME=/usr/java/jdk1.7.0/ -# The maximum amount of heap to use, in MB. Default is 1000. -export HBASE_HEAPSIZE=4096 +# The maximum amount of heap to use. Default is left to JVM default. +export HBASE_HEAPSIZE=4G ---- Use +rsync+ to copy the content of the _conf_ directory to all nodes of the cluster.