HBASE-15528 Clean up outdated entries in hbase-default.xml Signed-off-by: Enis Soztutar <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0e370633 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0e370633 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0e370633 Branch: refs/heads/hbase-12439 Commit: 0e3706334519d18ade5089e883173de41f6202e8 Parents: 6abe187 Author: Junegunn Choi <[email protected]> Authored: Fri Mar 25 17:23:04 2016 +0900 Committer: Enis Soztutar <[email protected]> Committed: Tue May 3 19:09:19 2016 -0700 ---------------------------------------------------------------------- .../src/main/resources/hbase-default.xml | 45 +----------- src/main/asciidoc/_chapters/hbase-default.adoc | 77 +------------------- 2 files changed, 3 insertions(+), 119 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/0e370633/hbase-common/src/main/resources/hbase-default.xml ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml index e19cbf8..62a6b62 100644 --- a/hbase-common/src/main/resources/hbase-default.xml +++ b/hbase-common/src/main/resources/hbase-default.xml @@ -155,12 +155,6 @@ possible configurations would overwhelm and obscure the important. hbase-site.xml.</description> </property> <property> - <name>hbase.master.catalog.timeout</name> - <value>600000</value> - <description>Timeout value for the Catalog Janitor from the master to - META.</description> - </property> - <property> <name>hbase.master.infoserver.redirect</name> <value>true</value> <description>Whether or not the Master listens to the Master web @@ -311,11 +305,6 @@ possible configurations would overwhelm and obscure the important. Default 1 hour. Set it to 0 to disable automatic flushing.</description> </property> <property> - <name>hbase.regionserver.catalog.timeout</name> - <value>600000</value> - <description>Timeout value for the Catalog Janitor from the regionserver to META.</description> - </property> - <property> <name>hbase.regionserver.dns.interface</name> <value>default</value> <description>The name of the Network Interface from which a region server @@ -373,14 +362,6 @@ possible configurations would overwhelm and obscure the important. relative path, so they will all go under this directory unless changed.</description> </property> <property> - <name>zookeeper.znode.rootserver</name> - <value>root-region-server</value> - <description>Path to ZNode holding root region location. This is written by - the master and read by clients and region servers. If a relative path is - given, the parent folder will be ${zookeeper.znode.parent}. By default, - this means the root location is stored at /hbase/root-region-server.</description> - </property> - <property> <name>zookeeper.znode.acl.parent</name> <value>acl</value> <description>Root ZNode for access control lists.</description> @@ -876,7 +857,7 @@ possible configurations would overwhelm and obscure the important. megabytes of BucketCache. Default: 0.0</description> </property> <property> - <name>hbase.bucketcache.sizes</name> + <name>hbase.bucketcache.bucket.sizes</name> <value></value> <description>A comma-separated list of sizes for buckets for the bucketcache. Can be multiple sizes. List block sizes in order from smallest to largest. @@ -1193,15 +1174,6 @@ possible configurations would overwhelm and obscure the important. hbase.thrift.maxQueuedRequests threads.</description> </property> <property> - <name>hbase.thrift.htablepool.size.max</name> - <value>1000</value> - <description>The upper bound for the table pool used in the Thrift gateways server. - Since this is per table name, we assume a single table and so with 1000 default - worker threads max this is set to a matching number. For other workloads this number - can be adjusted as needed. - </description> - </property> - <property> <name>hbase.regionserver.thrift.framed</name> <value>false</value> <description>Use Thrift TFramedTransport on the server side. @@ -1240,21 +1212,6 @@ possible configurations would overwhelm and obscure the important. files when hbase.data.umask.enable is true</description> </property> <property> - <name>hbase.metrics.showTableName</name> - <value>true</value> - <description>Whether to include the prefix "tbl.tablename" in per-column family metrics. - If true, for each metric M, per-cf metrics will be reported for tbl.T.cf.CF.M, if false, - per-cf metrics will be aggregated by column-family across tables, and reported for cf.CF.M. - In both cases, the aggregated metric M across tables and cfs will be reported.</description> - </property> - <property> - <name>hbase.metrics.exposeOperationTimes</name> - <value>true</value> - <description>Whether to report metrics about time taken performing an - operation on the region server. Get, Put, Delete, Increment, and Append can all - have their times exposed through Hadoop metrics per CF and per region.</description> - </property> - <property> <name>hbase.snapshot.enabled</name> <value>true</value> <description>Set to true to allow snapshots to be taken / restored / cloned.</description> http://git-wip-us.apache.org/repos/asf/hbase/blob/0e370633/src/main/asciidoc/_chapters/hbase-default.adoc ---------------------------------------------------------------------- diff --git a/src/main/asciidoc/_chapters/hbase-default.adoc b/src/main/asciidoc/_chapters/hbase-default.adoc index 26929a3..df750e0 100644 --- a/src/main/asciidoc/_chapters/hbase-default.adoc +++ b/src/main/asciidoc/_chapters/hbase-default.adoc @@ -173,17 +173,6 @@ A comma-separated list of BaseHFileCleanerDelegate invoked by `org.apache.hadoop.hbase.master.cleaner.TimeToLiveHFileCleaner` -[[hbase.master.catalog.timeout]] -*`hbase.master.catalog.timeout`*:: -+ -.Description -Timeout value for the Catalog Janitor from the master to - META. -+ -.Default -`600000` - - [[hbase.master.infoserver.redirect]] *`hbase.master.infoserver.redirect`*:: + @@ -442,16 +431,6 @@ Maximum size of all memstores in a region server before flushes are forced. `3600000` -[[hbase.regionserver.catalog.timeout]] -*`hbase.regionserver.catalog.timeout`*:: -+ -.Description -Timeout value for the Catalog Janitor from the regionserver to META. -+ -.Default -`600000` - - [[hbase.regionserver.dns.interface]] *`hbase.regionserver.dns.interface`*:: + @@ -522,19 +501,6 @@ Root ZNode for HBase in ZooKeeper. All of HBase's ZooKeeper `/hbase` -[[zookeeper.znode.rootserver]] -*`zookeeper.znode.rootserver`*:: -+ -.Description -Path to ZNode holding root region location. This is written by - the master and read by clients and region servers. If a relative path is - given, the parent folder will be ${zookeeper.znode.parent}. By default, - this means the root location is stored at /hbase/root-region-server. -+ -.Default -`root-region-server` - - [[zookeeper.znode.acl.parent]] *`zookeeper.znode.acl.parent`*:: + @@ -1280,8 +1246,8 @@ Used along with bucket cache, this is a float that EITHER represents a percentag `0` when specified as a float -[[hbase.bucketcache.sizes]] -*`hbase.bucketcache.sizes`*:: +[[hbase.bucketcache.bucket.sizes]] +*`hbase.bucketcache.bucket.sizes`*:: + .Description A comma-separated list of sizes for buckets for the bucketcache @@ -1691,20 +1657,6 @@ The maximum number of pending Thrift connections waiting in the queue. If `1000` -[[hbase.thrift.htablepool.size.max]] -*`hbase.thrift.htablepool.size.max`*:: -+ -.Description -The upper bound for the table pool used in the Thrift gateways server. - Since this is per table name, we assume a single table and so with 1000 default - worker threads max this is set to a matching number. For other workloads this number - can be adjusted as needed. - -+ -.Default -`1000` - - [[hbase.regionserver.thrift.framed]] *`hbase.regionserver.thrift.framed`*:: + @@ -1761,31 +1713,6 @@ File permissions that should be used to write data `000` -[[hbase.metrics.showTableName]] -*`hbase.metrics.showTableName`*:: -+ -.Description -Whether to include the prefix "tbl.tablename" in per-column family metrics. - If true, for each metric M, per-cf metrics will be reported for tbl.T.cf.CF.M, if false, - per-cf metrics will be aggregated by column-family across tables, and reported for cf.CF.M. - In both cases, the aggregated metric M across tables and cfs will be reported. -+ -.Default -`true` - - -[[hbase.metrics.exposeOperationTimes]] -*`hbase.metrics.exposeOperationTimes`*:: -+ -.Description -Whether to report metrics about time taken performing an - operation on the region server. Get, Put, Delete, Increment, and Append can all - have their times exposed through Hadoop metrics per CF and per region. -+ -.Default -`true` - - [[hbase.snapshot.enabled]] *`hbase.snapshot.enabled`*:: +
