You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2017/12/25 10:51:32 UTC
[06/22] hbase git commit: HBASE-19602 Cleanup the usage of
ReplicationAdmin from document
HBASE-19602 Cleanup the usage of ReplicationAdmin from document
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2f255894
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2f255894
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2f255894
Branch: refs/heads/HBASE-19397
Commit: 2f255894223abb51b6f9d5c680e226b25c6d788a
Parents: 0dadb45
Author: Guanghao Zhang <zg...@apache.org>
Authored: Sat Dec 23 10:25:08 2017 +0800
Committer: Guanghao Zhang <zg...@apache.org>
Committed: Sat Dec 23 18:55:54 2017 +0800
----------------------------------------------------------------------
hbase-common/src/main/resources/hbase-default.xml | 2 +-
.../org/apache/hadoop/hbase/util/ServerRegionReplicaUtil.java | 2 +-
src/main/asciidoc/_chapters/architecture.adoc | 4 ++--
src/main/asciidoc/_chapters/hbase-default.adoc | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/2f255894/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 8758741..8a34bad 100644
--- a/hbase-common/src/main/resources/hbase-default.xml
+++ b/hbase-common/src/main/resources/hbase-default.xml
@@ -1604,7 +1604,7 @@ possible configurations would overwhelm and obscure the important.
If this is enabled, a replication peer named "region_replica_replication" will be created
which will tail the logs and replicate the mutations to region replicas for tables that
have region replication > 1. If this is enabled once, disabling this replication also
- requires disabling the replication peer using shell or ReplicationAdmin java class.
+ requires disabling the replication peer using shell or Admin java class.
Replication to secondary region replicas works over standard inter-cluster replication.
</description>
</property>
http://git-wip-us.apache.org/repos/asf/hbase/blob/2f255894/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ServerRegionReplicaUtil.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ServerRegionReplicaUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ServerRegionReplicaUtil.java
index fe514d8..8a43d17 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ServerRegionReplicaUtil.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ServerRegionReplicaUtil.java
@@ -50,7 +50,7 @@ public class ServerRegionReplicaUtil extends RegionReplicaUtil {
* If this is enabled, a replication peer named "region_replica_replication" will be created
* which will tail the logs and replicate the mutatations to region replicas for tables that
* have region replication > 1. If this is enabled once, disabling this replication also
- * requires disabling the replication peer using shell or ReplicationAdmin java class.
+ * requires disabling the replication peer using shell or {@link Admin} java class.
* Replication to secondary region replicas works over standard inter-cluster replication.ยท
*/
public static final String REGION_REPLICA_REPLICATION_CONF_KEY
http://git-wip-us.apache.org/repos/asf/hbase/blob/2f255894/src/main/asciidoc/_chapters/architecture.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/_chapters/architecture.adoc b/src/main/asciidoc/_chapters/architecture.adoc
index 9a3cbd9..9091d5e 100644
--- a/src/main/asciidoc/_chapters/architecture.adoc
+++ b/src/main/asciidoc/_chapters/architecture.adoc
@@ -2505,7 +2505,7 @@ Committing writes in the same order as in primary ensures that the secondaries w
Async WAL Replication is *disabled* by default. You can enable this feature by setting `hbase.region.replica.replication.enabled` to `true`.
Asyn WAL Replication feature will add a new replication peer named `region_replica_replication` as a replication peer when you create a table with region replication > 1 for the first time. Once enabled, if you want to disable this feature, you need to do two actions:
* Set configuration property `hbase.region.replica.replication.enabled` to false in `hbase-site.xml` (see Configuration section below)
-* Disable the replication peer named `region_replica_replication` in the cluster using hbase shell or `ReplicationAdmin` class:
+* Disable the replication peer named `region_replica_replication` in the cluster using hbase shell or `Admin` class:
[source,bourne]
----
hbase> disable_peer 'region_replica_replication'
@@ -2558,7 +2558,7 @@ Instead you can change the number of region replicas per table to increase or de
<name>hbase.region.replica.replication.enabled</name>
<value>true</value>
<description>
- Whether asynchronous WAL replication to the secondary region replicas is enabled or not. If this is enabled, a replication peer named "region_replica_replication" will be created which will tail the logs and replicate the mutations to region replicas for tables that have region replication > 1. If this is enabled once, disabling this replication also requires disabling the replication peer using shell or ReplicationAdmin java class. Replication to secondary region replicas works over standard inter-cluster replication.
+ Whether asynchronous WAL replication to the secondary region replicas is enabled or not. If this is enabled, a replication peer named "region_replica_replication" will be created which will tail the logs and replicate the mutations to region replicas for tables that have region replication > 1. If this is enabled once, disabling this replication also requires disabling the replication peer using shell or Admin java class. Replication to secondary region replicas works over standard inter-cluster replication.
</description>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/hbase/blob/2f255894/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 9b3cfb7..7798657 100644
--- a/src/main/asciidoc/_chapters/hbase-default.adoc
+++ b/src/main/asciidoc/_chapters/hbase-default.adoc
@@ -2033,7 +2033,7 @@ A comma-separated list of
If this is enabled, a replication peer named "region_replica_replication" will be created
which will tail the logs and replicate the mutations to region replicas for tables that
have region replication > 1. If this is enabled once, disabling this replication also
- requires disabling the replication peer using shell or ReplicationAdmin java class.
+ requires disabling the replication peer using shell or Admin java class.
Replication to secondary region replicas works over standard inter-cluster replication.