[hbase] 08/17: HBASE-22729 Start RSGroupInfoManager as default (#555)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch HBASE-22514
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 91583462ed20775f201ebc59af74349ad370151b
Author: Guanghao Zhang
AuthorDate: Tue Sep 3 11:39:19 2019 +0800
HBASE-22729 Start RSGroupInfoManager as default (#555)
Amending-Author: Duo Zhang
Signed-off-by: stack
---
.../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 10 ++
.../java/org/apache/hadoop/hbase/master/MasterServices.java| 8 ++--
.../org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java | 2 +-
.../org/apache/hadoop/hbase/rsgroup/RSGroupInfoManager.java| 5 +
.../org/apache/hadoop/hbase/master/MockNoopMasterServices.java | 9 -
5 files changed, 30 insertions(+), 4 deletions(-)
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index 44a5b65..6e828e2 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -185,6 +185,7 @@ import
org.apache.hadoop.hbase.replication.master.ReplicationHFileCleaner;
import org.apache.hadoop.hbase.replication.master.ReplicationLogCleaner;
import
org.apache.hadoop.hbase.replication.master.ReplicationPeerConfigUpgrader;
import org.apache.hadoop.hbase.replication.regionserver.ReplicationStatus;
+import org.apache.hadoop.hbase.rsgroup.RSGroupInfoManager;
import org.apache.hadoop.hbase.security.AccessDeniedException;
import org.apache.hadoop.hbase.security.SecurityConstants;
import org.apache.hadoop.hbase.security.UserProvider;
@@ -355,6 +356,8 @@ public class HMaster extends HRegionServer implements
MasterServices {
// manager of assignment nodes in zookeeper
private AssignmentManager assignmentManager;
+ private RSGroupInfoManager rsGroupInfoManager;
+
// manager of replication
private ReplicationPeerManager replicationPeerManager;
@@ -784,6 +787,8 @@ public class HMaster extends HRegionServer implements
MasterServices {
this.splitOrMergeTracker = new SplitOrMergeTracker(zooKeeper, conf, this);
this.splitOrMergeTracker.start();
+this.rsGroupInfoManager = RSGroupInfoManager.create(this);
+
this.replicationPeerManager = ReplicationPeerManager.create(zooKeeper,
conf);
this.drainingServerTracker = new DrainingServerTracker(zooKeeper, this,
this.serverManager);
@@ -3836,4 +3841,9 @@ public class HMaster extends HRegionServer implements
MasterServices {
rbc.chore();
}
}
+
+ @Override
+ public RSGroupInfoManager getRSRSGroupInfoManager() {
+return rsGroupInfoManager;
+ }
}
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java
index 0163998..28e254a 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java
@@ -18,10 +18,8 @@
package org.apache.hadoop.hbase.master;
import com.google.protobuf.Service;
-
import java.io.IOException;
import java.util.List;
-
import org.apache.hadoop.hbase.Server;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableDescriptors;
@@ -51,6 +49,7 @@ import
org.apache.hadoop.hbase.replication.ReplicationException;
import org.apache.hadoop.hbase.replication.ReplicationPeerConfig;
import org.apache.hadoop.hbase.replication.ReplicationPeerDescription;
import org.apache.hadoop.hbase.replication.SyncReplicationState;
+import org.apache.hadoop.hbase.rsgroup.RSGroupInfoManager;
import org.apache.hadoop.hbase.security.access.AccessChecker;
import org.apache.hadoop.hbase.security.access.ZKPermissionWatcher;
import org.apache.yetus.audience.InterfaceAudience;
@@ -541,4 +540,9 @@ public interface MasterServices extends Server {
* Run the ReplicationBarrierChore.
*/
void runReplicationBarrierCleaner();
+
+ /**
+ * @return the {@link RSGroupInfoManager}
+ */
+ RSGroupInfoManager getRSRSGroupInfoManager();
}
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java
index a2a5623..0bde67b 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java
@@ -66,7 +66,7 @@ public class RSGroupAdminEndpoint implements
MasterCoprocessor, MasterObserver {
}
master = ((HasMasterServices) env).getMasterServices();
-groupInfoManager = RSGroupInfoManagerImpl.getInstance(master);
+groupInfoManager = master.getRSRSGroupInfoManager();
groupAdminServer = new
[hbase] 08/17: HBASE-22729 Start RSGroupInfoManager as default (#555)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch HBASE-22514
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 21b35a17c605ea1f652e5a9ea57380d07ced5c47
Author: Guanghao Zhang
AuthorDate: Tue Sep 3 11:39:19 2019 +0800
HBASE-22729 Start RSGroupInfoManager as default (#555)
Amending-Author: Duo Zhang
Signed-off-by: stack
---
.../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 10 ++
.../java/org/apache/hadoop/hbase/master/MasterServices.java| 8 ++--
.../org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java | 2 +-
.../org/apache/hadoop/hbase/rsgroup/RSGroupInfoManager.java| 5 +
.../org/apache/hadoop/hbase/master/MockNoopMasterServices.java | 9 -
5 files changed, 30 insertions(+), 4 deletions(-)
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index 44a5b65..6e828e2 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -185,6 +185,7 @@ import
org.apache.hadoop.hbase.replication.master.ReplicationHFileCleaner;
import org.apache.hadoop.hbase.replication.master.ReplicationLogCleaner;
import
org.apache.hadoop.hbase.replication.master.ReplicationPeerConfigUpgrader;
import org.apache.hadoop.hbase.replication.regionserver.ReplicationStatus;
+import org.apache.hadoop.hbase.rsgroup.RSGroupInfoManager;
import org.apache.hadoop.hbase.security.AccessDeniedException;
import org.apache.hadoop.hbase.security.SecurityConstants;
import org.apache.hadoop.hbase.security.UserProvider;
@@ -355,6 +356,8 @@ public class HMaster extends HRegionServer implements
MasterServices {
// manager of assignment nodes in zookeeper
private AssignmentManager assignmentManager;
+ private RSGroupInfoManager rsGroupInfoManager;
+
// manager of replication
private ReplicationPeerManager replicationPeerManager;
@@ -784,6 +787,8 @@ public class HMaster extends HRegionServer implements
MasterServices {
this.splitOrMergeTracker = new SplitOrMergeTracker(zooKeeper, conf, this);
this.splitOrMergeTracker.start();
+this.rsGroupInfoManager = RSGroupInfoManager.create(this);
+
this.replicationPeerManager = ReplicationPeerManager.create(zooKeeper,
conf);
this.drainingServerTracker = new DrainingServerTracker(zooKeeper, this,
this.serverManager);
@@ -3836,4 +3841,9 @@ public class HMaster extends HRegionServer implements
MasterServices {
rbc.chore();
}
}
+
+ @Override
+ public RSGroupInfoManager getRSRSGroupInfoManager() {
+return rsGroupInfoManager;
+ }
}
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java
index 0163998..28e254a 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java
@@ -18,10 +18,8 @@
package org.apache.hadoop.hbase.master;
import com.google.protobuf.Service;
-
import java.io.IOException;
import java.util.List;
-
import org.apache.hadoop.hbase.Server;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableDescriptors;
@@ -51,6 +49,7 @@ import
org.apache.hadoop.hbase.replication.ReplicationException;
import org.apache.hadoop.hbase.replication.ReplicationPeerConfig;
import org.apache.hadoop.hbase.replication.ReplicationPeerDescription;
import org.apache.hadoop.hbase.replication.SyncReplicationState;
+import org.apache.hadoop.hbase.rsgroup.RSGroupInfoManager;
import org.apache.hadoop.hbase.security.access.AccessChecker;
import org.apache.hadoop.hbase.security.access.ZKPermissionWatcher;
import org.apache.yetus.audience.InterfaceAudience;
@@ -541,4 +540,9 @@ public interface MasterServices extends Server {
* Run the ReplicationBarrierChore.
*/
void runReplicationBarrierCleaner();
+
+ /**
+ * @return the {@link RSGroupInfoManager}
+ */
+ RSGroupInfoManager getRSRSGroupInfoManager();
}
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java
index a2a5623..0bde67b 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java
@@ -66,7 +66,7 @@ public class RSGroupAdminEndpoint implements
MasterCoprocessor, MasterObserver {
}
master = ((HasMasterServices) env).getMasterServices();
-groupInfoManager = RSGroupInfoManagerImpl.getInstance(master);
+groupInfoManager = master.getRSRSGroupInfoManager();
groupAdminServer = new
[hbase] 08/17: HBASE-22729 Start RSGroupInfoManager as default (#555)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch HBASE-22514
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 0d37785e857383ee98452b093f8ddf29071804d5
Author: Guanghao Zhang
AuthorDate: Tue Sep 3 11:39:19 2019 +0800
HBASE-22729 Start RSGroupInfoManager as default (#555)
Amending-Author: Duo Zhang
Signed-off-by: stack
---
.../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 10 ++
.../java/org/apache/hadoop/hbase/master/MasterServices.java| 8 ++--
.../org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java | 2 +-
.../org/apache/hadoop/hbase/rsgroup/RSGroupInfoManager.java| 5 +
.../org/apache/hadoop/hbase/master/MockNoopMasterServices.java | 9 -
5 files changed, 30 insertions(+), 4 deletions(-)
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index 44a5b65..6e828e2 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -185,6 +185,7 @@ import
org.apache.hadoop.hbase.replication.master.ReplicationHFileCleaner;
import org.apache.hadoop.hbase.replication.master.ReplicationLogCleaner;
import
org.apache.hadoop.hbase.replication.master.ReplicationPeerConfigUpgrader;
import org.apache.hadoop.hbase.replication.regionserver.ReplicationStatus;
+import org.apache.hadoop.hbase.rsgroup.RSGroupInfoManager;
import org.apache.hadoop.hbase.security.AccessDeniedException;
import org.apache.hadoop.hbase.security.SecurityConstants;
import org.apache.hadoop.hbase.security.UserProvider;
@@ -355,6 +356,8 @@ public class HMaster extends HRegionServer implements
MasterServices {
// manager of assignment nodes in zookeeper
private AssignmentManager assignmentManager;
+ private RSGroupInfoManager rsGroupInfoManager;
+
// manager of replication
private ReplicationPeerManager replicationPeerManager;
@@ -784,6 +787,8 @@ public class HMaster extends HRegionServer implements
MasterServices {
this.splitOrMergeTracker = new SplitOrMergeTracker(zooKeeper, conf, this);
this.splitOrMergeTracker.start();
+this.rsGroupInfoManager = RSGroupInfoManager.create(this);
+
this.replicationPeerManager = ReplicationPeerManager.create(zooKeeper,
conf);
this.drainingServerTracker = new DrainingServerTracker(zooKeeper, this,
this.serverManager);
@@ -3836,4 +3841,9 @@ public class HMaster extends HRegionServer implements
MasterServices {
rbc.chore();
}
}
+
+ @Override
+ public RSGroupInfoManager getRSRSGroupInfoManager() {
+return rsGroupInfoManager;
+ }
}
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java
index 0163998..28e254a 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java
@@ -18,10 +18,8 @@
package org.apache.hadoop.hbase.master;
import com.google.protobuf.Service;
-
import java.io.IOException;
import java.util.List;
-
import org.apache.hadoop.hbase.Server;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableDescriptors;
@@ -51,6 +49,7 @@ import
org.apache.hadoop.hbase.replication.ReplicationException;
import org.apache.hadoop.hbase.replication.ReplicationPeerConfig;
import org.apache.hadoop.hbase.replication.ReplicationPeerDescription;
import org.apache.hadoop.hbase.replication.SyncReplicationState;
+import org.apache.hadoop.hbase.rsgroup.RSGroupInfoManager;
import org.apache.hadoop.hbase.security.access.AccessChecker;
import org.apache.hadoop.hbase.security.access.ZKPermissionWatcher;
import org.apache.yetus.audience.InterfaceAudience;
@@ -541,4 +540,9 @@ public interface MasterServices extends Server {
* Run the ReplicationBarrierChore.
*/
void runReplicationBarrierCleaner();
+
+ /**
+ * @return the {@link RSGroupInfoManager}
+ */
+ RSGroupInfoManager getRSRSGroupInfoManager();
}
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java
index a2a5623..0bde67b 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java
@@ -66,7 +66,7 @@ public class RSGroupAdminEndpoint implements
MasterCoprocessor, MasterObserver {
}
master = ((HasMasterServices) env).getMasterServices();
-groupInfoManager = RSGroupInfoManagerImpl.getInstance(master);
+groupInfoManager = master.getRSRSGroupInfoManager();
groupAdminServer = new
