Repository: hbase Updated Branches: refs/heads/branch-2 1eb2f2593 -> 16a5a9db3
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/16a5a9db Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/16a5a9db Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/16a5a9db Branch: refs/heads/branch-2 Commit: 16a5a9db3edf3594b492f548b78bf8342884373f Parents: 1eb2f25 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:59:32 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/16a5a9db/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 +}
