diff --git a/hbase-shell/src/main/ruby/hbase/replication_admin.rb b/hbase-shell/src/main/ruby/hbase/replication_admin.rb index f80c547..9493f04 100644 --- a/hbase-shell/src/main/ruby/hbase/replication_admin.rb +++ b/hbase-shell/src/main/ruby/hbase/replication_admin.rb @@ -221,12 +221,19 @@ module Hbase rpc = get_peer_config(id) unless rpc.nil? ns_set = rpc.getNamespaces - ns_set = java.util.HashSet.new if ns_set.nil? + ns_set2 = java.util.HashSet.new + unless ns_set.nil? + ns_set.each do |n| + ns_set2.add(n) + end + end namespaces.each do |n| - ns_set.add(n) + ns_set2.add(n) end - rpc.setNamespaces(ns_set) - @admin.updateReplicationPeerConfig(id, rpc) + builder = org.apache.hadoop.hbase.replication.ReplicationPeerConfig + .newBuilder(rpc) + builder.setNamespaces(ns_set2) + @admin.updateReplicationPeerConfig(id, builder.build) end end end @@ -237,13 +244,16 @@ module Hbase rpc = get_peer_config(id) unless rpc.nil? ns_set = rpc.getNamespaces + ns_set2 = java.util.HashSet.new unless ns_set.nil? - namespaces.each do |n| - ns_set.remove(n) + ns_set.each do |n| + ns_set2.add(n) if !namespaces.include? n end end - rpc.setNamespaces(ns_set) - @admin.updateReplicationPeerConfig(id, rpc) + builder = org.apache.hadoop.hbase.replication.ReplicationPeerConfig + .newBuilder(rpc) + builder.setNamespaces(ns_set2) + @admin.updateReplicationPeerConfig(id, builder.build) end end end @@ -353,19 +363,24 @@ module Hbase # Create and populate a ReplicationPeerConfig replication_peer_config = get_peer_config(id) + builder = org.apache.hadoop.hbase.replication.ReplicationPeerConfig + .newBuilder(replication_peer_config) unless config.nil? - replication_peer_config.get_configuration.put_all(config) + builder.putAllConfiguration(config) end unless data.nil? # Convert Strings to Bytes for peer_data peer_data = replication_peer_config.get_peer_data + data2 = java.util.TreeMap.new(Bytes::BYTES_COMPARATOR) + data2.putAll(peer_data) data.each do |key, val| - peer_data.put(Bytes.to_bytes(key), Bytes.to_bytes(val)) + data2.put(Bytes.to_bytes(key), Bytes.to_bytes(val)) end + builder.putAllPeerData(data2) end - @admin.updateReplicationPeerConfig(id, replication_peer_config) + @admin.updateReplicationPeerConfig(id, builder.build) end end end