Repository: hbase Updated Branches: refs/heads/0.98 2c239e058 -> 4e2ab8f23
HBASE-15079 TestMultiParallel.validateLoadedData AssertionError: null Conflicts: hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4e2ab8f2 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4e2ab8f2 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4e2ab8f2 Branch: refs/heads/0.98 Commit: 4e2ab8f23938f23191a7a6ab2c78fd5b96da29db Parents: 2c239e0 Author: stack <st...@apache.org> Authored: Thu Jan 7 15:35:59 2016 -0800 Committer: Andrew Purtell <apurt...@apache.org> Committed: Tue Feb 9 23:32:42 2016 -0800 ---------------------------------------------------------------------- .../hadoop/hbase/client/TestMultiParallel.java | 40 ++++++++++++++++++-- 1 file changed, 36 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/4e2ab8f2/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java index 60fc674..d172055 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java @@ -671,13 +671,45 @@ public class TestMultiParallel { private void validateLoadedData(HTable table) throws IOException { // get the data back and validate that it is correct + LOG.info("Validating data on " + table); + List<Get> gets = new ArrayList<Get>(); for (byte[] k : KEYS) { Get get = new Get(k); get.addColumn(BYTES_FAMILY, QUALIFIER); - Result r = table.get(get); - Assert.assertTrue(r.containsColumn(BYTES_FAMILY, QUALIFIER)); - Assert.assertEquals(0, Bytes.compareTo(VALUE, r - .getValue(BYTES_FAMILY, QUALIFIER))); + gets.add(get); + } + int retryNum = 10; + Result[] results = null; + do { + results = table.get(gets); + boolean finished = true; + for (Result result : results) { + if (result.isEmpty()) { + finished = false; + break; + } + } + if (finished) { + break; + } + try { + Thread.sleep(10); + } catch (InterruptedException e) { + } + retryNum--; + } while (retryNum > 0); + + if (retryNum == 0) { + fail("Timeout for validate data"); + } else { + if (results != null) { + for (Result r : results) { + Assert.assertTrue(r.containsColumn(BYTES_FAMILY, QUALIFIER)); + Assert.assertEquals(0, Bytes.compareTo(VALUE, r + .getValue(BYTES_FAMILY, QUALIFIER))); + } + LOG.info("Validating data on " + table + " successfully!"); + } } }