tillrohrmann commented on a change in pull request #6464: [FLINK-9936][mesos] 
WIP 
URL: https://github.com/apache/flink/pull/6464#discussion_r207463934
 
 

 ##########
 File path: 
flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManager.java
 ##########
 @@ -894,17 +900,21 @@ public void grantLeadership(final UUID 
newLeaderSessionID) {
 
                                // clear the state if we've been the leader 
before
                                if (getFencingToken() != null) {
-                                       clearState();
+                                       clearStateInternal();
                                }
 
                                setFencingToken(newResourceManagerId);
 
                                slotManager.start(getFencingToken(), 
getMainThreadExecutor(), new ResourceActionsImpl());
 
-                               getRpcService().execute(
-                                       () ->
+                               prepareLeadershipAsync()
+                                       .exceptionally(t -> {
+                                               onFatalError(t);
+                                               return null;
+                                       })
+                                       .thenRunAsync(() ->
                                                // confirming the leader 
session ID might be blocking,
-                                               
leaderElectionService.confirmLeaderSessionID(newLeaderSessionID));
+                                               
leaderElectionService.confirmLeaderSessionID(newLeaderSessionID), 
getRpcService().getExecutor());
 
 Review comment:
   The check would help to guard against a concurrent revoke leadership which 
is triggered just before the aynchronous grant leadership call is executed. 
That way we would not unnecessarily initialize internal components which would 
be stopped by the revoke leadership async callback. At the moment this is not 
very likely to happen but if we make `clearState` asynchronous and wait in the 
`grantLeadership` method to complete the cleanup before calling the leadership 
callback, it gets more and more likely.

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
[email protected]


With regards,
Apache Git Services

Reply via email to