You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2017/11/05 18:21:10 UTC
[3/3] hbase git commit: Revert "HBASE-19131 Add the ClusterStatus
hook and cleanup other hooks which can be replaced by ClusterStatus hook"
Revert "HBASE-19131 Add the ClusterStatus hook and cleanup other hooks which can be replaced by ClusterStatus hook"
This reverts commit 9ad69e446529e5b48595063039ef58730e9fd842.
Compatibility concerns (change removes Master.proto ListDeadServersRequest)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7148982a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7148982a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7148982a
Branch: refs/heads/branch-1.4
Commit: 7148982a607ac4b4c510f8a76ea06510812c92af
Parents: 9ad69e4
Author: Andrew Purtell <ap...@apache.org>
Authored: Sun Nov 5 10:20:22 2017 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Sun Nov 5 10:20:22 2017 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/ClusterStatus.java | 17 +-
.../org/apache/hadoop/hbase/ServerLoad.java | 32 -
.../hadoop/hbase/client/ConnectionManager.java | 9 +-
.../apache/hadoop/hbase/client/HBaseAdmin.java | 10 +-
.../hbase/protobuf/generated/MasterProtos.java | 1497 ++++++++++++++++--
hbase-protocol/src/main/protobuf/Master.proto | 12 +
.../hbase/rsgroup/RSGroupAdminEndpoint.java | 9 +-
.../tmpl/master/BackupMasterStatusTmpl.jamon | 3 +-
.../BaseMasterAndRegionObserver.java | 6 +-
.../hbase/coprocessor/BaseMasterObserver.java | 12 +-
.../hbase/coprocessor/MasterObserver.java | 18 +-
.../org/apache/hadoop/hbase/master/HMaster.java | 24 +-
.../hbase/master/MasterCoprocessorHost.java | 15 +-
.../hadoop/hbase/master/MasterRpcServices.java | 29 +
.../master/balancer/ClusterStatusChore.java | 2 +-
.../hbase/security/access/AccessController.java | 23 +-
.../hbase/client/TestClientClusterStatus.java | 188 ---
.../hbase/coprocessor/TestMasterObserver.java | 7 +-
.../TestSplitTransactionOnCluster.java | 2 +-
.../security/access/TestAccessController.java | 14 -
20 files changed, 1448 insertions(+), 481 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/7148982a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java
index 3ca55fc..97b0ea2 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java
@@ -19,7 +19,6 @@
package org.apache.hadoop.hbase;
-import com.google.common.base.Objects;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -195,14 +194,14 @@ public class ClusterStatus extends VersionedWritable {
if (!(o instanceof ClusterStatus)) {
return false;
}
- ClusterStatus other = (ClusterStatus) o;
- return Objects.equal(getHBaseVersion(), other.getHBaseVersion()) &&
- Objects.equal(this.liveServers, other.liveServers) &&
- getDeadServerNames().containsAll(other.getDeadServerNames()) &&
- Arrays.equals(getMasterCoprocessors(), other.getMasterCoprocessors()) &&
- Objects.equal(getMaster(), other.getMaster()) &&
- getBackupMasters().containsAll(other.getBackupMasters()) &&
- Objects.equal(getClusterId(), other.getClusterId());
+ return (getVersion() == ((ClusterStatus)o).getVersion()) &&
+ getHBaseVersion().equals(((ClusterStatus)o).getHBaseVersion()) &&
+ this.liveServers.equals(((ClusterStatus)o).liveServers) &&
+ this.deadServers.containsAll(((ClusterStatus)o).deadServers) &&
+ Arrays.equals(this.masterCoprocessors,
+ ((ClusterStatus)o).masterCoprocessors) &&
+ this.master.equals(((ClusterStatus)o).master) &&
+ this.backupMasters.containsAll(((ClusterStatus)o).backupMasters);
}
/**
http://git-wip-us.apache.org/repos/asf/hbase/blob/7148982a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java
index e6d2a1d..ddca47a 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java
@@ -20,7 +20,6 @@
package org.apache.hadoop.hbase;
-import com.google.common.base.Objects;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.classification.InterfaceStability;
import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
@@ -330,35 +329,4 @@ public class ServerLoad {
public long getReportTime() {
return reportTime;
}
-
- @Override
- public int hashCode() {
- return Objects.hashCode(stores, storefiles, storeUncompressedSizeMB,
- storefileSizeMB, memstoreSizeMB, storefileIndexSizeMB, readRequestsCount,
- writeRequestsCount, rootIndexSizeKB, totalStaticIndexSizeKB,
- totalStaticBloomSizeKB, totalCompactingKVs, currentCompactedKVs);
- }
-
- @Override
- public boolean equals(Object other) {
- if (other == this) {
- return true;
- }
- if (other instanceof ServerLoad) {
- ServerLoad sl = ((ServerLoad) other);
- return stores == sl.stores && storefiles == sl.storefiles
- && storeUncompressedSizeMB == sl.storeUncompressedSizeMB
- && storefileSizeMB == sl.storefileSizeMB
- && memstoreSizeMB == sl.memstoreSizeMB
- && storefileIndexSizeMB == sl.storefileIndexSizeMB
- && readRequestsCount == sl.readRequestsCount
- && writeRequestsCount == sl.writeRequestsCount
- && rootIndexSizeKB == sl.rootIndexSizeKB
- && totalStaticIndexSizeKB == sl.totalStaticIndexSizeKB
- && totalStaticBloomSizeKB == sl.totalStaticBloomSizeKB
- && totalCompactingKVs == sl.totalCompactingKVs
- && currentCompactedKVs == sl.currentCompactedKVs;
- }
- return false;
- }
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/7148982a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java
index 3f2cf1c..8204bb8 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java
@@ -1808,6 +1808,13 @@ class ConnectionManager {
}
@Override
+ public MasterProtos.ListDeadServersResponse listDeadServers(
+ RpcController controller,
+ MasterProtos.ListDeadServersRequest request) throws ServiceException {
+ return stub.listDeadServers(controller, request);
+ }
+
+ @Override
public AddColumnResponse addColumn(RpcController controller, AddColumnRequest request)
throws ServiceException {
return stub.addColumn(controller, request);
@@ -2714,7 +2721,7 @@ class ConnectionManager {
public boolean hasCellBlockSupport() {
return this.rpcClient.hasCellBlockSupport();
}
-
+
@Override
public ConnectionConfiguration getConnectionConfiguration() {
return this.connectionConfig;
http://git-wip-us.apache.org/repos/asf/hbase/blob/7148982a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
index 0925e38..d543ddb 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
@@ -136,6 +136,7 @@ import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsRestoreSnapshot
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsRestoreSnapshotDoneResponse;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsSnapshotDoneRequest;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsSnapshotDoneResponse;
+import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListDeadServersRequest;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListNamespaceDescriptorsRequest;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListProceduresRequest;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListTableDescriptorsByNamespaceRequest;
@@ -4902,7 +4903,14 @@ public class HBaseAdmin implements Admin {
@Override
public List<ServerName> listDeadServers() throws IOException {
- return new ArrayList<>(getClusterStatus().getDeadServerNames());
+ return executeCallable(new MasterCallable<List<ServerName>>(getConnection()) {
+ @Override
+ public List<ServerName> call(int callTimeout) throws ServiceException {
+ ListDeadServersRequest req = ListDeadServersRequest.newBuilder().build();
+ return ProtobufUtil.toServerNameList(
+ master.listDeadServers(null, req).getServerNameList());
+ }
+ });
}
@Override