HBASE-13145 TestNamespaceAuditor.testRegionMerge is flaky

Signed-off-by: stack <stack@apache.org>

Conflicts:
	hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
This commit is contained in:
zhangduo 2015-03-03 16:56:29 +08:00 committed by stack
parent 946c53ce65
commit 2c02f2f154
1 changed files with 2 additions and 1 deletions

View File

@ -1572,7 +1572,8 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver { //
*/
@VisibleForTesting
public long getEarliestFlushTimeForAllStores() {
return Collections.min(lastStoreFlushTimeMap.values());
return lastStoreFlushTimeMap.isEmpty() ? Long.MAX_VALUE : Collections.min(lastStoreFlushTimeMap
.values());
}
/**