-
Notifications
You must be signed in to change notification settings - Fork 113
[controller] Add flag to block first leader transition until init routines complete #2347
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
sushantmane
wants to merge
1
commit into
linkedin:main
Choose a base branch
from
sushantmane:ClusterLeaderInitializationRoutine-Block
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -28,14 +28,25 @@ public class ClusterLeaderInitializationManager implements ClusterLeaderInitiali | |||||||
| new VeniceConcurrentHashMap<>(); | ||||||||
| private final List<ClusterLeaderInitializationRoutine> initRoutines; | ||||||||
| private final boolean concurrentInit; | ||||||||
| private final boolean blockUntilComplete; | ||||||||
| private final LogContext logContext; | ||||||||
| private volatile boolean hasExecutedOnce = false; | ||||||||
|
|
||||||||
| public ClusterLeaderInitializationManager( | ||||||||
| List<ClusterLeaderInitializationRoutine> initRoutines, | ||||||||
| boolean concurrentInit, | ||||||||
| LogContext logContext) { | ||||||||
| this(initRoutines, concurrentInit, false, logContext); | ||||||||
| } | ||||||||
|
|
||||||||
| public ClusterLeaderInitializationManager( | ||||||||
| List<ClusterLeaderInitializationRoutine> initRoutines, | ||||||||
| boolean concurrentInit, | ||||||||
| boolean blockUntilComplete, | ||||||||
| LogContext logContext) { | ||||||||
| this.initRoutines = initRoutines; | ||||||||
| this.concurrentInit = concurrentInit; | ||||||||
| this.blockUntilComplete = blockUntilComplete; | ||||||||
| this.logContext = logContext; | ||||||||
| } | ||||||||
|
|
||||||||
|
|
@@ -47,31 +58,90 @@ public void execute(String clusterToInit) { | |||||||
| Map<ClusterLeaderInitializationRoutine, Object> initializedRoutinesForCluster = | ||||||||
| initializedClusters.computeIfAbsent(clusterToInit, k -> new VeniceConcurrentHashMap<>()); | ||||||||
|
|
||||||||
| // Check if this is the first time execute() has been called on this manager instance | ||||||||
| boolean isFirstExecution = !hasExecutedOnce; | ||||||||
|
|
||||||||
| LOGGER.info( | ||||||||
| "Starting initialization routines for cluster: {}. Mode: {}, BlockUntilComplete: {}, FirstExecution: {}, RoutineCount: {}", | ||||||||
| clusterToInit, | ||||||||
| concurrentInit ? "CONCURRENT" : "SEQUENTIAL", | ||||||||
| blockUntilComplete, | ||||||||
| isFirstExecution, | ||||||||
| initRoutines.size()); | ||||||||
|
|
||||||||
| long startTime = System.currentTimeMillis(); | ||||||||
| CompletableFuture<Void> allRoutinesFuture; | ||||||||
| if (concurrentInit) { | ||||||||
| initRoutines.forEach( | ||||||||
| routine -> CompletableFuture | ||||||||
| .runAsync(() -> initRoutine(clusterToInit, initializedRoutinesForCluster, routine))); | ||||||||
| CompletableFuture<?>[] futures = initRoutines.stream() | ||||||||
| .map( | ||||||||
| routine -> CompletableFuture | ||||||||
| .runAsync(() -> initRoutine(clusterToInit, initializedRoutinesForCluster, routine))) | ||||||||
| .toArray(CompletableFuture[]::new); | ||||||||
| allRoutinesFuture = CompletableFuture.allOf(futures); | ||||||||
| } else { | ||||||||
| CompletableFuture.runAsync( | ||||||||
| allRoutinesFuture = CompletableFuture.runAsync( | ||||||||
| () -> initRoutines.forEach(routine -> initRoutine(clusterToInit, initializedRoutinesForCluster, routine))); | ||||||||
| } | ||||||||
|
|
||||||||
| // Block on the first execution if the flag is enabled | ||||||||
| if (blockUntilComplete && isFirstExecution) { | ||||||||
| try { | ||||||||
| LOGGER.info( | ||||||||
| "Blocking until all initialization routines complete for cluster: {} (first time execute called)", | ||||||||
| clusterToInit); | ||||||||
| allRoutinesFuture.join(); | ||||||||
| long elapsedMs = System.currentTimeMillis() - startTime; | ||||||||
| LOGGER.info( | ||||||||
| "All initialization routines completed for cluster: {} (first time execute called). Elapsed time: {} ms", | ||||||||
| clusterToInit, | ||||||||
| elapsedMs); | ||||||||
| } catch (Exception e) { | ||||||||
| long elapsedMs = System.currentTimeMillis() - startTime; | ||||||||
| LOGGER.error( | ||||||||
| "Error while waiting for initialization routines to complete for cluster: {}. Elapsed time: {} ms", | ||||||||
| clusterToInit, | ||||||||
| elapsedMs, | ||||||||
| e); | ||||||||
| } finally { | ||||||||
| hasExecutedOnce = true; | ||||||||
| } | ||||||||
| } else { | ||||||||
| if (!hasExecutedOnce) { | ||||||||
| hasExecutedOnce = true; | ||||||||
| } | ||||||||
|
Comment on lines
+109
to
+111
|
||||||||
| if (!hasExecutedOnce) { | |
| hasExecutedOnce = true; | |
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The hasExecutedOnce flag is read without synchronization at line 62, then potentially updated at lines 106 and 110. This creates a race condition where multiple threads calling execute() concurrently could both read false for isFirstExecution, causing both to block. This violates the stated intent that only the first execution should block. Consider using AtomicBoolean.compareAndSet() to atomically check and set the flag, ensuring only one thread can observe isFirstExecution as true.