You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ss...@apache.org on 2015/07/15 19:48:41 UTC
hive git commit: HIVE-11260. LLAP: Fix NPE in AMReporter. (Siddharth
Seth)
Repository: hive
Updated Branches:
refs/heads/llap fc9f75836 -> 08aabedca
HIVE-11260. LLAP: Fix NPE in AMReporter. (Siddharth Seth)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/08aabedc
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/08aabedc
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/08aabedc
Branch: refs/heads/llap
Commit: 08aabedcaec7a7e9b4e884b695483374d5b5ae16
Parents: fc9f758
Author: Siddharth Seth <ss...@apache.org>
Authored: Wed Jul 15 10:48:03 2015 -0700
Committer: Siddharth Seth <ss...@apache.org>
Committed: Wed Jul 15 10:48:03 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/hive/llap/daemon/impl/AMReporter.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/08aabedc/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/AMReporter.java
----------------------------------------------------------------------
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/AMReporter.java b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/AMReporter.java
index 8ec9f22..2fd2546 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/AMReporter.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/AMReporter.java
@@ -203,8 +203,9 @@ public class AMReporter extends AbstractService {
amNodeInfo = knownAppMasters.get(amNodeId);
if (amNodeInfo == null) {
LOG.info(("Ignoring duplicate unregisterRequest for am at: " + amLocation + ":" + port));
+ } else {
+ amNodeInfo.decrementAndGetTaskCount();
}
- amNodeInfo.decrementAndGetTaskCount();
// Not removing this here. Will be removed when taken off the queue and discovered to have 0
// pending tasks.
}