hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject hbase git commit: HBASE-HBASE-18290 Fix TestAddColumnFamilyProcedure and TestDeleteTableProcedure
Date Thu, 29 Jun 2017 16:34:10 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-2 7e7917ed6 -> 3dcb03947


HBASE-HBASE-18290 Fix TestAddColumnFamilyProcedure and TestDeleteTableProcedure


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

Branch: refs/heads/branch-2
Commit: 3dcb03947ce9cb1825167784992e689a23847351
Parents: 7e7917e
Author: Michael Stack <stack@apache.org>
Authored: Wed Jun 28 15:23:00 2017 -0700
Committer: Michael Stack <stack@apache.org>
Committed: Thu Jun 29 09:34:02 2017 -0700

----------------------------------------------------------------------
 .../hbase/procedure2/store/wal/ProcedureWALFormatReader.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/3dcb0394/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormatReader.java
----------------------------------------------------------------------
diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormatReader.java
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormatReader.java
index c1b1439..e528c73 100644
--- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormatReader.java
+++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormatReader.java
@@ -483,8 +483,12 @@ public class ProcedureWALFormatReader {
      */
     private static boolean isIncreasing(ProcedureProtos.Procedure current,
         ProcedureProtos.Procedure candidate) {
-      boolean increasing = current.getStackIdCount() <= candidate.getStackIdCount() &&
-        current.getLastUpdate() <= candidate.getLastUpdate();
+      // Check that the procedures we see are 'increasing'. We used to compare
+      // procedure id first and then update time but it can legitimately go backwards if
the
+      // procedure is failed or rolled back so that was unreliable. Was going to compare
+      // state but lets see if comparing update time enough (unfortunately this issue only
+      // seen under load...)
+      boolean increasing = current.getLastUpdate() <= candidate.getLastUpdate();
       if (!increasing) {
         LOG.warn("NOT INCREASING! current=" + current + ", candidate=" + candidate);
       }


Mime
View raw message