From 1e490dcc11be8acca2c58795b0ee022fe1dcd077 Mon Sep 17 00:00:00 2001 From: Guanghao Zhang Date: Sat, 23 Dec 2017 10:25:08 +0800 Subject: [PATCH] HBASE-19602 Cleanup the usage of ReplicationAdmin from document --- 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(-) diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml index 941fb538bba..df46fb44471 100644 --- a/hbase-common/src/main/resources/hbase-default.xml +++ b/hbase-common/src/main/resources/hbase-default.xml @@ -1603,7 +1603,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. 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 fe514d8c1c2..8a43d174b39 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 diff --git a/src/main/asciidoc/_chapters/architecture.adoc b/src/main/asciidoc/_chapters/architecture.adoc index 1c9671da046..5ba81c1f249 100644 --- a/src/main/asciidoc/_chapters/architecture.adoc +++ b/src/main/asciidoc/_chapters/architecture.adoc @@ -2521,7 +2521,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' @@ -2574,7 +2574,7 @@ Instead you can change the number of region replicas per table to increase or de hbase.region.replica.replication.enabled true - 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. diff --git a/src/main/asciidoc/_chapters/hbase-default.adoc b/src/main/asciidoc/_chapters/hbase-default.adoc index 9b3cfb7355e..77986576a36 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.