From d20e920761dd061e2eda363288c9b54635f35177 Mon Sep 17 00:00:00 2001
From: Sean Busbey <busbey@apache.org>
Date: Wed, 30 Oct 2019 00:32:37 -0500
Subject: [PATCH] HBASE-23171 Ensure region state error messages include server
 making report (branch-2.1)

---
 .../hbase/master/assignment/AssignmentManager.java     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 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 184204443df6..f47d625a1c5d 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
@@ -991,8 +991,8 @@ void checkOnlineRegionsReportForMeta(final ServerName serverName, final Set<byte
         final RegionInfo hri = getMetaRegionFromName(regionName);
         if (hri == null) {
           if (LOG.isTraceEnabled()) {
-            LOG.trace("Skip online report for region=" + Bytes.toStringBinary(regionName) +
-              " while meta is loading");
+            LOG.trace("Skip online report for region={} while meta is loading from server={}",
+                Bytes.toStringBinary(regionName), serverName);
           }
           continue;
         }
@@ -1035,7 +1035,8 @@ void checkOnlineRegionsReport(final ServerStateNode serverNode, final Set<byte[]
                     " but state has otherwise AND NO procedure is running");
                 }
               } catch (UnexpectedStateException e) {
-                LOG.warn(regionNode.toString() + " reported unexpteced OPEN: " + e.getMessage(), e);
+                LOG.warn("{} reported unexpteced OPEN: {} sever={}", regionNode.toString(),
+                    e.getMessage(), serverName, e);
               }
             }
           } else if (!regionNode.isInState(State.CLOSING, State.SPLITTING)) {
@@ -1054,7 +1055,8 @@ void checkOnlineRegionsReport(final ServerStateNode serverNode, final Set<byte[]
       //See HBASE-21421, we can count on reportRegionStateTransition calls
       //We only log a warming here. It could be a network lag.
       LOG.warn("Failed to checkOnlineRegionsReport, maybe due to network lag, "
-          + "if this message continues, be careful of double assign", e);
+          + "if this message continues, be careful of double assign. report from server={}",
+          serverName, e);
     }
   }