Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-18216 [AMv2] Workaround for HBASE-18152, corrupt procedure WAL; 

ADDENDUM

Forgot this change found testing.
This commit is contained in:
Michael Stack 2017-06-13 21:58:48 -07:00
parent 0b43353bf7
commit 550b6c585e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormatReader.java
View File

@ -483,7 +483,7 @@ public class ProcedureWALFormatReader {
*/ */
private static boolean isIncreasing(ProcedureProtos.Procedure current, private static boolean isIncreasing(ProcedureProtos.Procedure current,
ProcedureProtos.Procedure candidate) { ProcedureProtos.Procedure candidate) {
boolean increasing = current.getStackIdCount() < candidate.getStackIdCount() && boolean increasing = current.getStackIdCount() <= candidate.getStackIdCount() &&
current.getLastUpdate() <= candidate.getLastUpdate(); current.getLastUpdate() <= candidate.getLastUpdate();
if (!increasing) { if (!increasing) {
LOG.warn("NOT INCREASING! current=" + current + ", candidate=" + candidate); LOG.warn("NOT INCREASING! current=" + current + ", candidate=" + candidate);
@ -868,4 +868,4 @@ public class ProcedureWALFormatReader {
return (int)(Procedure.getProcIdHashCode(procId) % procedureMap.length); return (int)(Procedure.getProcIdHashCode(procId) % procedureMap.length);
} }
} }
} }