From 80d1bce153a8b7eb5c179511617e7b1269cc6aa4 Mon Sep 17 00:00:00 2001 From: Jai Balani Date: Thu, 28 Nov 2024 14:12:45 +0530 Subject: [PATCH] Changes for moving state build to FCM --- .../com/github/ambry/config/ClusterMapConfig.java | 2 -- .../github/ambry/clustermap/HelixParticipant.java | 15 ++++----------- .../java/com/github/ambry/FileCopyManager.java | 3 ++- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/ambry-api/src/main/java/com/github/ambry/config/ClusterMapConfig.java b/ambry-api/src/main/java/com/github/ambry/config/ClusterMapConfig.java index 252e5a3d70..f5fdcead8a 100644 --- a/ambry-api/src/main/java/com/github/ambry/config/ClusterMapConfig.java +++ b/ambry-api/src/main/java/com/github/ambry/config/ClusterMapConfig.java @@ -372,8 +372,6 @@ public class ClusterMapConfig { @Default("false") public final boolean clusterMapIgnoreDownwardStateTransition; - public static final String ENABLE_FILE_COPY_FOR_BOOTSTRAP = "clustermap.enable.file.copy.for.bootstrap"; - public ClusterMapConfig(VerifiableProperties verifiableProperties) { clusterMapFixedTimeoutDatanodeErrorThreshold = verifiableProperties.getIntInRange("clustermap.fixedtimeout.datanode.error.threshold", 3, 1, 100); diff --git a/ambry-clustermap/src/main/java/com/github/ambry/clustermap/HelixParticipant.java b/ambry-clustermap/src/main/java/com/github/ambry/clustermap/HelixParticipant.java index 8ce373f3b5..eabf9abd05 100644 --- a/ambry-clustermap/src/main/java/com/github/ambry/clustermap/HelixParticipant.java +++ b/ambry-clustermap/src/main/java/com/github/ambry/clustermap/HelixParticipant.java @@ -65,8 +65,6 @@ */ public class HelixParticipant implements ClusterParticipant, PartitionStateChangeListener { public static final String DISK_KEY = "DISK"; - - public static final boolean ENABLE_FILE_COPY = false; final HelixParticipantMetrics participantMetrics; private final HelixClusterManager clusterManager; private final String clusterName; @@ -876,15 +874,10 @@ public void onPartitionBecomeBootstrapFromOffline(String partitionName) { storageManagerListener.onPartitionBecomeBootstrapFromOffline(partitionName); } - if (ENABLE_FILE_COPY) { - // TODO: Filecopy Invocation - // TODO: Statebuild Invocation: storageManagerListener.buildStateForFileCopy. Functional signature - // 1. TODO: Start the store - // 2. TODO: Enable compaction for the new started store - - // StateBuilding - storageManagerListener.buildStateForFileCopy(partitionName); - } + // TODO: Filecopy Invocation + // TODO: Statebuild Invocation: storageManagerListener.buildStateForFileCopy. Functional signature + // 1. TODO: Start the store + // 2. TODO: Enable compaction for the new started store // 2. take actions in replication manager (add new replica if necessary) PartitionStateChangeListener replicationManagerListener = diff --git a/ambry-file-transfer/src/main/java/com/github/ambry/FileCopyManager.java b/ambry-file-transfer/src/main/java/com/github/ambry/FileCopyManager.java index dab5ad17d0..d4cd37c1bf 100644 --- a/ambry-file-transfer/src/main/java/com/github/ambry/FileCopyManager.java +++ b/ambry-file-transfer/src/main/java/com/github/ambry/FileCopyManager.java @@ -41,7 +41,8 @@ class PartitionStateChangeListenerImpl implements PartitionStateChangeListener { @Override public void onPartitionBecomeBootstrapFromOffline(String partitionName) { - + // StateBuilding at the end of FCM's Offline->Bootstrap transition + storeManager.buildStateForFileCopy(partitionName); } @Override