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

HBASE-HBASE-18290 Fix TestAddColumnFamilyProcedure and TestDeleteTableProcedure

This commit is contained in:
Michael Stack 2017-06-28 15:23:00 -07:00
parent 7e7917ed6d
commit 3dcb03947c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -483,8 +483,12 @@ 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() && // Check that the procedures we see are 'increasing'. We used to compare
current.getLastUpdate() <= candidate.getLastUpdate(); // 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) { if (!increasing) {
LOG.warn("NOT INCREASING! current=" + current + ", candidate=" + candidate); LOG.warn("NOT INCREASING! current=" + current + ", candidate=" + candidate);
} }