(hbase) branch branch-2.6 updated: HBASE-29733 Use ServerName instead of hostname in unloadRegions log message (#7487) (#8455)

[lupeng]

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

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


The following commit(s) were added to refs/heads/branch-2.6 by this push:
     new 45dc58f037e HBASE-29733 Use ServerName instead of hostname in 
unloadRegions log message (#7487) (#8455)
45dc58f037e is described below

commit 45dc58f037efed18af4e5385c3b713e4a9606bce
Author: Peng Lu <lup...@apache.org>
AuthorDate: Tue Jul 7 23:47:36 2026 +0800

    HBASE-29733 Use ServerName instead of hostname in unloadRegions log message 
(#7487) (#8455)
    
    Signed-off-by: Pankaj Kumar <pankajku...@apache.org>
    Signed-off-by: Dávid Paksy <pak...@apache.org>
    Signed-off-by: Peng Lu <lup...@apache.org>
    Signed-off-by: Chandra Kambham <chan...@apache.org>
    Co-authored-by: JC <jc100...@gmail.com>
---
 .../java/org/apache/hadoop/hbase/util/RegionMover.java  | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionMover.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionMover.java
index 3873786ddb7..6483cc78f4d 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionMover.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionMover.java
@@ -583,8 +583,8 @@ public class RegionMover extends AbstractHBaseTool 
implements Closeable {
             isolateRegionInfo = hRegionLocation.getRegion();
             isolateRegionInfoList.add(isolateRegionInfo);
             if (hRegionLocation.getServerName() == server) {
-              LOG.info("Region " + 
hRegionLocation.getRegion().getEncodedName() + " already exists"
-                + " on server : " + server.getHostname());
+              LOG.info("Region {} already exists on server: {}",
+                hRegionLocation.getRegion().getEncodedName(), server);
             } else {
               Future<Boolean> isolateRegionTask =
                 isolateRegionPool.submit(new MoveWithAck(conn, 
isolateRegionInfo,
@@ -608,14 +608,14 @@ public class RegionMover extends AbstractHBaseTool 
implements Closeable {
             break;
           }
         } else {
-          LOG.info("All regions already exists on server : " + 
server.getHostname());
+          LOG.info("All regions already exists on server: {}", server);
         }
         // Once region has been moved to target RS, put the target RS into 
decommission mode,
         // so master doesn't assign new region to the target RS while we 
unload the target RS.
         // Also pass 'offload' flag as false since we don't want master to 
offload the target RS.
         List<ServerName> listOfServer = new ArrayList<>();
         listOfServer.add(server);
-        LOG.info("Putting server : " + server.getHostname() + " in 
decommission/draining mode");
+        LOG.info("Putting server: {} in decommission/draining mode", server);
         admin.decommissionRegionServers(listOfServer, false);
       }
       List<RegionInfo> regionsToMove = admin.getRegions(server);
@@ -628,7 +628,7 @@ public class RegionMover extends AbstractHBaseTool 
implements Closeable {
         break;
       }
       LOG.info("Moving {} regions from {} to {} servers using {} threads .Ack 
Mode: {}",
-        regionsToMove.size(), this.hostname, regionServers.size(), 
this.maxthreads, ack);
+        regionsToMove.size(), server, regionServers.size(), this.maxthreads, 
ack);
 
       Optional<RegionInfo> metaRegion = 
getMetaRegionInfoIfToBeMoved(regionsToMove);
       if (metaRegion.isPresent()) {
@@ -684,10 +684,11 @@ public class RegionMover extends AbstractHBaseTool 
implements Closeable {
     try {
       return task.get(5, TimeUnit.SECONDS);
     } catch (InterruptedException e) {
-      LOG.warn("Interrupted while " + operation + " Regions on " + 
this.hostname, e);
+      LOG.warn("Interrupted while {} regions on {}:{}", operation, 
this.hostname, this.port, e);
       throw e;
     } catch (ExecutionException e) {
-      LOG.error("Error while " + operation + " regions on RegionServer " + 
this.hostname, e);
+      LOG.error("Error while {} regions on RegionServer {}:{}", operation, 
this.hostname, this.port,
+        e);
       throw e;
     }
   }
@@ -852,7 +853,7 @@ public class RegionMover extends AbstractHBaseTool 
implements Closeable {
     if (fileName != null) {
       List<String> servers = readServersFromFile(fileName);
       if (servers.isEmpty()) {
-        LOG.warn("No servers provided in the file: {}." + fileName);
+        LOG.warn("No servers provided in the file: {}.", fileName);
         return;
       }
       Iterator<ServerName> i = regionServers.iterator();