Revert "[RSGroup] Forward-port HBASE-22658 to master branch and branc…

…h-2.x (apache#1326)"

Reason: Invalid, branch-2 and master is different in RSGroup module.

This reverts commit 27c1f2f

hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionMover.java

@@ -31,7 +31,6 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.Iterator;
@@ -61,8 +60,6 @@
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter;
-import org.apache.hadoop.hbase.net.Address;
-import org.apache.hadoop.hbase.rsgroup.RSGroupInfo;
 import org.apache.yetus.audience.InterfaceAudience;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -419,9 +416,7 @@ public boolean unload() throws InterruptedException, ExecutionException, Timeout
       try {
         // Get Online RegionServers
         List<ServerName> regionServers = new ArrayList<>();
-        RSGroupInfo rsgroup = admin.getRSGroup(Address.fromParts(hostname, port));
-        LOG.info("{} belongs to {}", hostname, rsgroup.getName());
-        regionServers.addAll(filterRSGroupServers(rsgroup, admin.getRegionServers()));
+        regionServers.addAll(admin.getRegionServers());
         // Remove the host Region server from target Region Servers list
         ServerName server = stripServer(regionServers, hostname, port);
         if (server == null) {
@@ -436,8 +431,6 @@ public boolean unload() throws InterruptedException, ExecutionException, Timeout
         if (regionServers.isEmpty()) {
           LOG.warn("No Regions were moved - no servers available");
           return false;
-        } else {
-          LOG.info("Available servers {}", regionServers);
         }
         unloadRegions(server, regionServers, movedRegions);
       } catch (Exception e) {
@@ -453,22 +446,6 @@ public boolean unload() throws InterruptedException, ExecutionException, Timeout
     return waitTaskToFinish(unloadPool, unloadTask, "unloading");
   }
 
-  @VisibleForTesting
-   Collection<ServerName> filterRSGroupServers(RSGroupInfo rsgroup,
-      Collection<ServerName> onlineServers) {
-    if (rsgroup.getName().equals(RSGroupInfo.DEFAULT_GROUP)) {
-      return onlineServers;
-    }
-    List<ServerName> serverLists = new ArrayList<>(rsgroup.getServers().size());
-    for (ServerName server : onlineServers) {
-      Address address = Address.fromParts(server.getHostname(), server.getPort());
-      if (rsgroup.containsServer(address)) {
-        serverLists.add(server);
-      }
-    }
-    return serverLists;
-  }
-
   private void unloadRegions(ServerName server, List<ServerName> regionServers,
       List<RegionInfo> movedRegions) throws Exception {
     while (true) {
@@ -813,4 +790,4 @@ public static void main(String[] args) {
       mover.doStaticMain(args);
     }
   }
-}
+}