Repository: hbase
Updated Branches:
  refs/heads/master bd9a41a36 -> 5e60166ea


HBASE-14424 Document that DisabledRegionSplitPolicy blocks manual splits


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

Branch: refs/heads/master
Commit: 5e60166eac9b607d719ae8a084312e13d65cf074
Parents: bd9a41a
Author: Misty Stanley-Jones <[email protected]>
Authored: Mon Sep 14 10:51:28 2015 +1000
Committer: Misty Stanley-Jones <[email protected]>
Committed: Wed Oct 7 12:08:22 2015 +1000

----------------------------------------------------------------------
 hbase-common/src/main/resources/hbase-default.xml | 3 ++-
 src/main/asciidoc/_chapters/architecture.adoc     | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/5e60166e/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 8702ac1..b825bef 100644
--- a/hbase-common/src/main/resources/hbase-default.xml
+++ b/hbase-common/src/main/resources/hbase-default.xml
@@ -334,7 +334,8 @@ possible configurations would overwhelm and obscure the 
important.
     <description>
       A split policy determines when a region should be split. The various 
other split policies that
       are available currently are ConstantSizeRegionSplitPolicy, 
DisabledRegionSplitPolicy,
-      DelimitedKeyPrefixRegionSplitPolicy, KeyPrefixRegionSplitPolicy etc.
+      DelimitedKeyPrefixRegionSplitPolicy, and KeyPrefixRegionSplitPolicy.
+      DisabledRegionSplitPolicy blocks manual region splitting.
     </description>
   </property>
   <property>

http://git-wip-us.apache.org/repos/asf/hbase/blob/5e60166e/src/main/asciidoc/_chapters/architecture.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/_chapters/architecture.adoc 
b/src/main/asciidoc/_chapters/architecture.adoc
index e6a71f1..c2f5f8a 100644
--- a/src/main/asciidoc/_chapters/architecture.adoc
+++ b/src/main/asciidoc/_chapters/architecture.adoc
@@ -1368,7 +1368,7 @@ The RegionServer splits a region, offlines the split 
region and then adds the da
 See <<disable.splitting>> for how to manually manage splits (and for why you 
might do this).
 
 ==== Custom Split Policies
-ou can override the default split policy using a custom 
link:http://hbase.apache.org/apidocs/org/apache/hadoop/hbase/regionserver/RegionSplitPolicy.html[RegionSplitPolicy](HBase
 0.94+). Typically a custom split policy should extend
+You can override the default split policy using a custom 
link:http://hbase.apache.org/apidocs/org/apache/hadoop/hbase/regionserver/RegionSplitPolicy.html[RegionSplitPolicy](HBase
 0.94+). Typically a custom split policy should extend
 HBase's default split policy: 
link:http://hbase.apache.org/apidocs/org/apache/hadoop/hbase/regionserver/IncreasingToUpperBoundRegionSplitPolicy.html[IncreasingToUpperBoundRegionSplitPolicy].
 
 The policy can set globally through the HBase configuration or on a per-table
@@ -1407,6 +1407,8 @@ HTableDescriptor myHtd = ...;
 myHtd.setValue(HTableDescriptor.SPLIT_POLICY, 
MyCustomSplitPolicy.class.getName());
 ----
 
+NOTE: The `DisabledRegionSplitPolicy` policy blocks manual region splitting.
+
 [[manual_region_splitting_decisions]]
 === Manual Region Splitting
 
@@ -1426,6 +1428,8 @@ There may be other valid reasons, but the need to 
manually split your table migh
 
 See <<disable.splitting>> for a discussion about the dangers and possible 
benefits of managing splitting completely manually.
 
+NOTE: The `DisabledRegionSplitPolicy` policy blocks manual region splitting.
+
 ==== Determining Split Points
 
 The goal of splitting your table manually is to improve the chances of 
balancing the load across the cluster in situations where good rowkey design 
alone won't get you there.

Reply via email to