Skip to content

Commit 28458de

Browse files
committed
HBASE-30238 Preserve bulkload descriptor cluster ids for replication
Keep using BulkLoadDescriptor cluster ids when invoking HFileReplicator so replicated bulkload RPCs do not treat the target cluster as already handled. The ZooKeeper event tracking identity remains unchanged.
1 parent 1b72829 commit 28458de

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,8 +317,7 @@ public void replicateEntries(List<WALEntry> entries, final ExtendedCellScanner c
317317
}
318318
// Map of table name Vs list of pair of family and list of
319319
// hfile paths from its namespace
320-
List<String> clusterIds = entry.getKey().getClusterIdsList().stream()
321-
.map(k -> toUUID(k).toString()).collect(Collectors.toList());
320+
List<String> clusterIds = bld.getClusterIdsList();
322321
Map<String, List<Pair<byte[], List<String>>>> bulkLoadHFileMap =
323322
bulkLoadsPerClusters.computeIfAbsent(clusterIds, k -> new HashMap<>());
324323
buildBulkLoadHFileMap(bulkLoadHFileMap, table, bld);

0 commit comments

Comments
 (0)