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 2018/05/25 06:47:06 UTC
hbase git commit: HBASE-20518 Need to serialize the enabled field for
UpdatePeerConfigProcedure
Repository: hbase
Updated Branches:
refs/heads/master 1fbce10ff -> 36f3d9432
HBASE-20518 Need to serialize the enabled field for UpdatePeerConfigProcedure
Signed-off-by: zhangduo <zh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/36f3d943
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/36f3d943
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/36f3d943
Branch: refs/heads/master
Commit: 36f3d9432a335163b8ccea5d8965e779d2c92fb4
Parents: 1fbce10
Author: meiyi <my...@gamil.com>
Authored: Fri May 25 09:30:01 2018 +0800
Committer: zhangduo <zh...@apache.org>
Committed: Fri May 25 14:36:16 2018 +0800
----------------------------------------------------------------------
hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto | 1 +
.../hadoop/hbase/master/replication/UpdatePeerConfigProcedure.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/36f3d943/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto b/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto
index eef32df..17a81cd 100644
--- a/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto
+++ b/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto
@@ -425,6 +425,7 @@ message AddPeerStateData {
message UpdatePeerConfigStateData {
required ReplicationPeer peer_config = 1;
optional ReplicationPeer old_peer_config = 2;
+ required bool enabled = 3;
}
message RemovePeerStateData {
http://git-wip-us.apache.org/repos/asf/hbase/blob/36f3d943/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/UpdatePeerConfigProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/UpdatePeerConfigProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/UpdatePeerConfigProcedure.java
index 39c8fa9..41e740f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/UpdatePeerConfigProcedure.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/UpdatePeerConfigProcedure.java
@@ -209,6 +209,7 @@ public class UpdatePeerConfigProcedure extends ModifyPeerProcedure {
if (oldPeerConfig != null) {
builder.setOldPeerConfig(ReplicationPeerConfigUtil.convert(oldPeerConfig));
}
+ builder.setEnabled(enabled);
serializer.serialize(builder.build());
}
@@ -222,5 +223,6 @@ public class UpdatePeerConfigProcedure extends ModifyPeerProcedure {
} else {
oldPeerConfig = null;
}
+ enabled = data.getEnabled();
}
}