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

Revert "HBASE-20015 TestMergeTableRegionsProcedure and TestRegionMergeTransactionOnCluster flakey" 

This reverts commit 72193650dd.
This commit is contained in:
Michael Stack 2018-02-16 23:21:56 -08:00
parent 3ea2ffcd57
commit 07bdd492f4
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java
View File

@ -255,16 +255,10 @@ public class MergeTableRegionsProcedure
throw new UnsupportedOperationException(this + " unhandled state=" + state); throw new UnsupportedOperationException(this + " unhandled state=" + state);
} }
} catch (IOException e) { } catch (IOException e) {
String msg = "Error trying to merge regions " + LOG.warn("Error trying to merge regions " + RegionInfo.getShortNameToLog(regionsToMerge) +
RegionInfo.getShortNameToLog(regionsToMerge) + " in the table " + getTableName() + " in the table " + getTableName() + " (in state=" + state + ")", e);
" (in state=" + state + ")";
if (!isRollbackSupported(state)) { setFailure("master-merge-regions", e);
// We reach a state that cannot be rolled back. We just need to keep retry.
LOG.warn(msg, e);
} else {
LOG.error(msg, e);
setFailure("master-merge-regions", e);
}
} }
return Flow.HAS_MORE_STATE; return Flow.HAS_MORE_STATE;
} }

1
hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java
View File

@ -270,7 +270,6 @@ public class SplitTableRegionProcedure
} else { } else {
LOG.error(msg, e); LOG.error(msg, e);
setFailure(e); setFailure(e);
setFailure("master-split-regions", e);
} }
} }
// if split fails, need to call ((HRegion)parent).clearSplit() when it is a force split // if split fails, need to call ((HRegion)parent).clearSplit() when it is a force split