Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-19619 Modify replication_admin.rb to use ReplicationPeerConfigBuilder

This commit is contained in:
tedyu 2017-12-27 02:37:02 -08:00
parent fbe633f14a
commit ccc3b2bbc0
1 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
hbase-shell/src/main/ruby/hbase/replication_admin.rb
View File

@ -66,22 +66,22 @@ module Hbase
peer_state = args.fetch(STATE, nil) peer_state = args.fetch(STATE, nil)
# Create and populate a ReplicationPeerConfig # Create and populate a ReplicationPeerConfig
replication_peer_config = ReplicationPeerConfig.new builder = org.apache.hadoop.hbase.replication.ReplicationPeerConfig
replication_peer_config.set_cluster_key(cluster_key) .newBuilder()
builder.set_cluster_key(cluster_key)
unless endpoint_classname.nil? unless endpoint_classname.nil?
replication_peer_config.set_replication_endpoint_impl(endpoint_classname) builder.set_replication_endpoint_impl(endpoint_classname)
end end
unless config.nil? unless config.nil?
replication_peer_config.get_configuration.put_all(config) builder.putAllConfiguration(config)
end end
unless data.nil? unless data.nil?
# Convert Strings to Bytes for peer_data # Convert Strings to Bytes for peer_data
peer_data = replication_peer_config.get_peer_data
data.each do |key, val| data.each do |key, val|
peer_data.put(Bytes.to_bytes(key), Bytes.to_bytes(val)) builder.putPeerData(Bytes.to_bytes(key), Bytes.to_bytes(val))
end end
end end
@ -90,8 +90,8 @@ module Hbase
namespaces.each do |n| namespaces.each do |n|
ns_set.add(n) ns_set.add(n)
end end
replication_peer_config.setReplicateAllUserTables(false) builder.setReplicateAllUserTables(false)
replication_peer_config.set_namespaces(ns_set) builder.set_namespaces(ns_set)
end end
unless table_cfs.nil? unless table_cfs.nil?
@ -100,15 +100,15 @@ module Hbase
table_cfs.each do |key, val| table_cfs.each do |key, val|
map.put(org.apache.hadoop.hbase.TableName.valueOf(key), val) map.put(org.apache.hadoop.hbase.TableName.valueOf(key), val)
end end
replication_peer_config.setReplicateAllUserTables(false) builder.setReplicateAllUserTables(false)
replication_peer_config.set_table_cfs_map(map) builder.set_table_cfs_map(map)
end end
enabled = true enabled = true
unless peer_state.nil? unless peer_state.nil?
enabled = false if peer_state == 'DISABLED' enabled = false if peer_state == 'DISABLED'
end end
@admin.addReplicationPeer(id, replication_peer_config, enabled) @admin.addReplicationPeer(id, builder.build, enabled)
else else
raise(ArgumentError, 'args must be a Hash') raise(ArgumentError, 'args must be a Hash')
end end
@ -220,13 +220,18 @@ module Hbase
unless namespaces.nil? unless namespaces.nil?
rpc = get_peer_config(id) rpc = get_peer_config(id)
unless rpc.nil? unless rpc.nil?
ns_set = rpc.getNamespaces if rpc.getNamespaces.nil?
ns_set = java.util.HashSet.new if ns_set.nil? ns_set = java.util.HashSet.new
else
ns_set = java.util.HashSet.new(rpc.getNamespaces)
end
namespaces.each do |n| namespaces.each do |n|
ns_set.add(n) ns_set.add(n)
end end
rpc.setNamespaces(ns_set) builder = org.apache.hadoop.hbase.replication.ReplicationPeerConfig
@admin.updateReplicationPeerConfig(id, rpc) .newBuilder(rpc)
builder.setNamespaces(ns_set)
@admin.updateReplicationPeerConfig(id, builder.build)
end end
end end
end end
@ -238,12 +243,15 @@ module Hbase
unless rpc.nil? unless rpc.nil?
ns_set = rpc.getNamespaces ns_set = rpc.getNamespaces
unless ns_set.nil? unless ns_set.nil?
ns_set = java.util.HashSet.new(ns_set)
namespaces.each do |n| namespaces.each do |n|
ns_set.remove(n) ns_set.remove(n)
end end
end end
rpc.setNamespaces(ns_set) builder = org.apache.hadoop.hbase.replication.ReplicationPeerConfig
@admin.updateReplicationPeerConfig(id, rpc) .newBuilder(rpc)
builder.setNamespaces(ns_set)
@admin.updateReplicationPeerConfig(id, builder.build)
end end
end end
end end
@ -353,19 +361,20 @@ module Hbase
# Create and populate a ReplicationPeerConfig # Create and populate a ReplicationPeerConfig
replication_peer_config = get_peer_config(id) replication_peer_config = get_peer_config(id)
builder = org.apache.hadoop.hbase.replication.ReplicationPeerConfig
.newBuilder(replication_peer_config)
unless config.nil? unless config.nil?
replication_peer_config.get_configuration.put_all(config) builder.putAllConfiguration(config)
end end
unless data.nil? unless data.nil?
# Convert Strings to Bytes for peer_data # Convert Strings to Bytes for peer_data
peer_data = replication_peer_config.get_peer_data
data.each do |key, val| data.each do |key, val|
peer_data.put(Bytes.to_bytes(key), Bytes.to_bytes(val)) builder.putPeerData(Bytes.to_bytes(key), Bytes.to_bytes(val))
end end
end end
@admin.updateReplicationPeerConfig(id, replication_peer_config) @admin.updateReplicationPeerConfig(id, builder.build)
end end
end end
end end