You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2023/03/19 12:23:24 UTC

[hbase] branch branch-2.4 updated: HBASE-27718 The regionStateNode only need remove once in regionOffline (#5106)

This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2.4 by this push:
     new 7e1f243c4ea HBASE-27718 The regionStateNode only need remove once in regionOffline (#5106)
7e1f243c4ea is described below

commit 7e1f243c4ead7b05f07c388f63e24fad03ecc88b
Author: chaijunjie0101 <64...@users.noreply.github.com>
AuthorDate: Sun Mar 19 20:14:52 2023 +0800

    HBASE-27718 The regionStateNode only need remove once in regionOffline (#5106)
    
    Signed-off-by: Duo Zhang <zh...@apache.org>
    (cherry picked from commit e6977a95975580831a31d122c800d01cadac007a)
---
 .../org/apache/hadoop/hbase/master/assignment/AssignmentManager.java | 2 --
 .../java/org/apache/hadoop/hbase/master/assignment/RegionStates.java | 5 -----
 2 files changed, 7 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java
index 69cc5ec7d41..2a5f31ef86a 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java
@@ -975,8 +975,6 @@ public class AssignmentManager {
     regionStateStore.deleteRegions(regions);
     for (int i = 0; i < regions.size(); ++i) {
       final RegionInfo regionInfo = regions.get(i);
-      // we expect the region to be offline
-      regionStates.removeFromOfflineRegions(regionInfo);
       regionStates.deleteRegion(regionInfo);
     }
   }
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStates.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStates.java
index 988269a3bfd..d85765de2f9 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStates.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStates.java
@@ -658,11 +658,6 @@ public class RegionStates {
     regionOffline.put(regionNode.getRegionInfo(), regionNode);
   }
 
-  // TODO: Unused.
-  public void removeFromOfflineRegions(final RegionInfo regionInfo) {
-    regionOffline.remove(regionInfo);
-  }
-
   // ==========================================================================
   // Region FAIL_OPEN helpers
   // ==========================================================================