diff --git a/CHANGES.txt b/CHANGES.txt index a2b2937e0a5..a98b4a5db0b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -444,6 +444,7 @@ Release 0.21.0 - Unreleased (Nicolas Spiegelberg via Stack) HBASE-2851 Remove testDynamicBloom() unit test (Nicolas Spiegelberg via Stack) + HBASE-2853 TestLoadIncrementalHFiles fails on TRUNK IMPROVEMENTS diff --git a/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java b/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java index d5374d2e12c..e02d11a2fbd 100644 --- a/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java +++ b/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java @@ -175,10 +175,11 @@ public class TestLoadIncrementalHFiles { { HFile.Writer writer = new HFile.Writer(fs, path, BLOCKSIZE, COMPRESSION, KeyValue.KEY_COMPARATOR); + long now = System.currentTimeMillis(); try { // subtract 2 since iterateOnSplits doesn't include boundary keys for (byte[] key : Bytes.iterateOnSplits(startKey, endKey, numRows-2)) { - KeyValue kv = new KeyValue(key, family, qualifier, key); + KeyValue kv = new KeyValue(key, family, qualifier, now, key); writer.append(kv); } } finally {