Test

apache · Dec 17, 2024 · fd4d358 · fd4d358
1 parent 7b11a31
commit fd4d358
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/hbase-replication/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeers.java b/hbase-replication/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeers.java
@@ -34,7 +34,7 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * This provides an class for maintaining a set of peer clusters. These peers are remote slave
+ * This provides a class for maintaining a set of peer clusters. These peers are remote slave
  * clusters that data is replicated to.
  * <p>
  * We implement {@link ConfigurationObserver} mainly for recreating the

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
@@ -125,7 +125,6 @@
 import org.apache.yetus.audience.InterfaceAudience;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import org.apache.hbase.thirdparty.com.google.common.collect.Sets;
 import org.apache.hbase.thirdparty.com.google.protobuf.ByteString;
 import org.apache.hbase.thirdparty.com.google.protobuf.Descriptors.MethodDescriptor;
@@ -135,7 +134,6 @@
 import org.apache.hbase.thirdparty.com.google.protobuf.Service;
 import org.apache.hbase.thirdparty.com.google.protobuf.ServiceException;
 import org.apache.hbase.thirdparty.com.google.protobuf.UnsafeByteOperations;
-
 import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
 import org.apache.hadoop.hbase.shaded.protobuf.ResponseConverter;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos;
@@ -2108,7 +2106,7 @@ public AddReplicationPeerResponse addReplicationPeer(RpcController controller,
   public RemoveReplicationPeerResponse removeReplicationPeer(RpcController controller,
     RemoveReplicationPeerRequest request) throws ServiceException {
     try {
-      long procId = server.removeReplicationPeer(request.getPeerId());
+      long procId = f.removeReplicationPeer(request.getPeerId());
       return RemoveReplicationPeerResponse.newBuilder().setProcId(procId).build();
     } catch (ReplicationException | IOException e) {
       throw new ServiceException(e);

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/HBaseReplicationEndpoint.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/HBaseReplicationEndpoint.java
@@ -42,7 +42,6 @@
 import org.apache.yetus.audience.InterfaceAudience;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import org.apache.hbase.thirdparty.com.google.common.collect.Maps;
 
 /**
@@ -87,9 +86,9 @@ public abstract class HBaseReplicationEndpoint extends BaseReplicationEndpoint
   private List<ServerName> sinkServers = new ArrayList<>(0);
 
   /**
-   * Some implementations of HBaseInterClusterReplicationEndpoint may require instantiate different
+   * Some implementations of HBaseInterClusterReplicationEndpoint may require us to instantiate different
    * Connection implementations, or initialize it in a different way, so defining createConnection
-   * as protected for possible overridings.
+   * as protected for possible overrides.
    */
   protected AsyncClusterConnection createConnection(URI clusterURI, Configuration conf)
     throws IOException {
@@ -159,7 +158,7 @@ public UUID getPeerUUID() {
   }
 
   // do not call this method in doStart method, only initialize the connection to remote cluster
-  // when you actually wants to make use of it. The problem here is that, starting the replication
+  // when you actually want to make use of it. The problem here is that, starting the replication
   // endpoint is part of the region server initialization work, so if the peer cluster is fully
   // down and we can not connect to it, we will cause the initialization to fail and crash the
   // region server, as we need the cluster id while setting up the AsyncClusterConnection, which

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/Replication.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/Replication.java
@@ -53,7 +53,7 @@
  * Gateway to Replication. Used by {@link org.apache.hadoop.hbase.regionserver.HRegionServer}.
  * <p>
  * Implement {@link PropagatingConfigurationObserver} mainly for registering
- * {@link ReplicationPeers}, so we can recreating the replication peer storage.
+ * {@link ReplicationPeers}, so we can recreate the replication peer storage.
  */
 @InterfaceAudience.Private
 public class Replication implements ReplicationSourceService, PropagatingConfigurationObserver {