HBASE-18679 Add a null check around the result of getCounters() in ITBLL
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b55b952d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b55b952d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b55b952d Branch: refs/heads/branch-2 Commit: b55b952d5c5e90bde03f454500e867b7909fea75 Parents: 005693f Author: Josh Elser <[email protected]> Authored: Thu Aug 24 17:52:13 2017 -0400 Committer: Josh Elser <[email protected]> Committed: Fri Aug 25 18:45:12 2017 -0400 ---------------------------------------------------------------------- .../hbase/test/IntegrationTestBigLinkedList.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/b55b952d/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java index 2fdfab6..f05ef66 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java @@ -820,6 +820,11 @@ public class IntegrationTestBigLinkedList extends IntegrationTestBase { public boolean verify() { try { Counters counters = job.getCounters(); + if (counters == null) { + LOG.info("Counters object was null, Generator verification cannot be performed." + + " This is commonly a result of insufficient YARN configuration."); + return false; + } if (counters.findCounter(Counts.TERMINATING).getValue() > 0 || counters.findCounter(Counts.UNDEFINED).getValue() > 0 || @@ -1315,7 +1320,8 @@ public class IntegrationTestBigLinkedList extends IntegrationTestBase { if (success) { Counters counters = job.getCounters(); if (null == counters) { - LOG.warn("Counters were null, cannot verify Job completion"); + LOG.warn("Counters were null, cannot verify Job completion." + + " This is commonly a result of insufficient YARN configuration."); // We don't have access to the counters to know if we have "bad" counts return 0; } @@ -1337,6 +1343,11 @@ public class IntegrationTestBigLinkedList extends IntegrationTestBase { } Counters counters = job.getCounters(); + if (counters == null) { + LOG.info("Counters object was null, write verification cannot be performed." + + " This is commonly a result of insufficient YARN configuration."); + return false; + } // Run through each check, even if we fail one early boolean success = verifyExpectedValues(expectedReferenced, counters);
