hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject [29/50] [abbrv] hbase git commit: Fix failing hbase-procedure tests
Date Tue, 23 May 2017 15:39:04 GMT
Fix failing hbase-procedure tests


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2c99a03b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2c99a03b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2c99a03b

Branch: refs/heads/HBASE-14614
Commit: 2c99a03b4164f02aa67dfb278aa12c177c9eb33e
Parents: bd67203
Author: Michael Stack <stack@apache.org>
Authored: Sat May 6 10:45:58 2017 -0700
Committer: Michael Stack <stack@apache.org>
Committed: Tue May 23 08:36:53 2017 -0700

----------------------------------------------------------------------
 .../java/org/apache/hadoop/hbase/procedure2/Procedure.java     | 2 +-
 .../org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java  | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/2c99a03b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java
----------------------------------------------------------------------
diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java
index 5527076..9c47957 100644
--- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java
+++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java
@@ -351,7 +351,7 @@ public abstract class Procedure<TEnvironment> implements Comparable<Procedure>
{
    * @param builder the string builder to use to append the proc specific information
    */
   protected void toStringClassDetails(StringBuilder builder) {
-    builder.append(getClass().getSimpleName());
+    builder.append(getClass().getName());
   }
 
   // ==========================================================================

http://git-wip-us.apache.org/repos/asf/hbase/blob/2c99a03b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java
----------------------------------------------------------------------
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 d36be64..e819ae8 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
@@ -1403,11 +1403,13 @@ public class ProcedureExecutor<TEnvironment> {
             reExecute = true;
             LOG.info("Short-circuit to rexecute for pid=" + procedure.getProcId());
           } else {
-            // yield the current procedure, and make the subprocedure runnable
+            // Yield the current procedure, and make the subprocedure runnable
+            // subprocs may come back 'null'.
             subprocs = initializeChildren(procStack, procedure, subprocs);
             LOG.info("Initialized subprocedures=" +
+              (subprocs == null? null:
                 Stream.of(subprocs).map(e -> "{" + e.toString() + "}").
-                collect(Collectors.toList()).toString());
+                collect(Collectors.toList()).toString()));
           }
         } else if (procedure.getState() == ProcedureState.WAITING_TIMEOUT) {
           if (LOG.isTraceEnabled()) {


Mime
View raw message