Umeshkumar9414 commented on code in PR #7375:
URL: https://github.com/apache/hbase/pull/7375#discussion_r2546325448


##########
hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionServerTracker.java:
##########
@@ -116,22 +117,23 @@ private RegionServerInfo getServerInfo(ServerName 
serverName)
    * In this method, we will also construct the region server sets in {@link 
ServerManager}. If a
    * region server is dead between the crash of the previous master instance 
and the start of the
    * current master instance, we will schedule a SCP for it. This is done in
-   * {@link ServerManager#findDeadServersAndProcess(Set, Set)}, we call it 
here under the lock
+   * {@link ServerManager#findDeadServersAndProcess(Map, Set)}, we call it 
here under the lock
    * protection to prevent concurrency issues with server expiration operation.
    * @param deadServersFromPE          the region servers which already have 
SCP associated.
    * @param liveServersBeforeRestart   the live region servers we recorded 
before master restarts.
    * @param splittingServersFromWALDir Servers whose WALs are being actively 
'split'.
    */
-  public void upgrade(Set<ServerName> deadServersFromPE, Set<ServerName> 
liveServersBeforeRestart,
-    Set<ServerName> splittingServersFromWALDir) throws KeeperException, 
IOException {
+  public void upgrade(Map<ServerName, Long> deadServersFromPE,
+    Set<ServerName> liveServersBeforeRestart, Set<ServerName> 
splittingServersFromWALDir)
+    throws KeeperException, IOException {
     LOG.info(
       "Upgrading RegionServerTracker to active master mode; {} have existing"
         + "ServerCrashProcedures, {} possibly 'live' servers, and {} 
'splitting'.",
       deadServersFromPE.size(), liveServersBeforeRestart.size(), 
splittingServersFromWALDir.size());
     // deadServersFromPE is made from a list of outstanding 
ServerCrashProcedures.
     // splittingServersFromWALDir are being actively split -- the directory in 
the FS ends in
     // '-SPLITTING'. Each splitting server should have a corresponding SCP. 
Log if not.
-    splittingServersFromWALDir.stream().filter(s -> 
!deadServersFromPE.contains(s))
+    splittingServersFromWALDir.stream().filter(s -> 
!deadServersFromPE.containsKey(s))

Review Comment:
   done



##########
hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java:
##########
@@ -440,7 +440,7 @@ boolean checkAndRecordNewServer(final ServerName 
serverName, final ServerMetrics
    * @param deadServersFromPE     the region servers which already have a SCP 
associated.
    * @param liveServersFromWALDir the live region servers from wal directory.
    */
-  void findDeadServersAndProcess(Set<ServerName> deadServersFromPE,
+  void findDeadServersAndProcess(Map<ServerName, Long> deadServersFromPE,

Review Comment:
   done



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to