From 9eeb501825e1c163f3149eb15b9444089f205460 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Sat, 16 Jun 2018 13:23:31 -0700
Subject: [PATCH] HBASE-20745 Log when master proc wal rolls

---
 .../org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java | 2 +-
 .../hadoop/hbase/procedure2/store/wal/WALProcedureStore.java  | 4 +---
 .../hadoop/hbase/master/assignment/AssignmentManager.java     | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java
index bd0a191490e..db7c1180371 100644
--- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java
+++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java
@@ -1861,7 +1861,7 @@ public class ProcedureExecutor<TEnvironment> {
 
         // WARN the worker is stuck
         stuckCount++;
-        LOG.warn("Worker stuck {} run time {}", worker,
+        LOG.warn("Worker stuck {}, run time {}", worker,
           StringUtils.humanTimeDiff(worker.getCurrentRunTime()));
       }
       return stuckCount;
diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
index 0c8cfd24403..26f4d156743 100644
--- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
+++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
@@ -1074,9 +1074,7 @@ public class WALProcedureStore extends ProcedureStoreBase {
         ". check running procedures to see if something is stuck.");
     }
 
-    if (LOG.isDebugEnabled()) {
-      LOG.debug("Roll new state log: " + logId);
-    }
+    LOG.info("Rolled new Procedure Store WAL, id={}", logId);
     return true;
   }
 
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 0d1fc16254c..0736435301f 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
@@ -135,7 +135,7 @@ public class AssignmentManager implements ServerListener {
 
   public static final String RIT_CHORE_INTERVAL_MSEC_CONF_KEY =
       "hbase.assignment.rit.chore.interval.msec";
-  private static final int DEFAULT_RIT_CHORE_INTERVAL_MSEC = 5 * 1000;
+  private static final int DEFAULT_RIT_CHORE_INTERVAL_MSEC = 60 * 1000;
 
   public static final String ASSIGN_MAX_ATTEMPTS =
       "hbase.assignment.maximum.attempts";