You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2017/06/14 04:59:21 UTC
hbase git commit: HBASE-18216 [AMv2] Workaround for HBASE-18152,
corrupt procedure WAL; ADDENDUM
Repository: hbase
Updated Branches:
refs/heads/master 0b43353bf -> 550b6c585
HBASE-18216 [AMv2] Workaround for HBASE-18152, corrupt procedure WAL;
ADDENDUM
Forgot this change found testing.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/550b6c58
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/550b6c58
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/550b6c58
Branch: refs/heads/master
Commit: 550b6c585e0390bc80516e64df8bd1a3a6e10e23
Parents: 0b43353
Author: Michael Stack <st...@apache.org>
Authored: Tue Jun 13 21:58:48 2017 -0700
Committer: Michael Stack <st...@apache.org>
Committed: Tue Jun 13 21:58:48 2017 -0700
----------------------------------------------------------------------
.../hbase/procedure2/store/wal/ProcedureWALFormatReader.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/550b6c58/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 4d644f7..c1b1439 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,7 +483,7 @@ public class ProcedureWALFormatReader {
*/
private static boolean isIncreasing(ProcedureProtos.Procedure current,
ProcedureProtos.Procedure candidate) {
- boolean increasing = current.getStackIdCount() < candidate.getStackIdCount() &&
+ boolean increasing = current.getStackIdCount() <= candidate.getStackIdCount() &&
current.getLastUpdate() <= candidate.getLastUpdate();
if (!increasing) {
LOG.warn("NOT INCREASING! current=" + current + ", candidate=" + candidate);
@@ -868,4 +868,4 @@ public class ProcedureWALFormatReader {
return (int)(Procedure.getProcIdHashCode(procId) % procedureMap.length);
}
}
-}
\ No newline at end of file
+}