From 47bfeba899e54a3c4613c81a8a7a4c66b17f0cfd Mon Sep 17 00:00:00 2001 From: Sebastian Bauersfeld Date: Fri, 5 Jan 2018 11:24:08 +0000 Subject: [PATCH 1/2] [FLINK-8372] Fix NullPointerException when stopping YarnWorkerNodes --- .../main/java/org/apache/flink/yarn/YarnResourceManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnResourceManager.java b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnResourceManager.java index 5a71f41763196..e3c7a0e0e13a3 100644 --- a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnResourceManager.java +++ b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnResourceManager.java @@ -276,7 +276,7 @@ public boolean stopWorker(YarnWorkerNode workerNode) { resourceManagerClient.releaseAssignedContainer(container.getId()); workerNodeMap.remove(workerNode.getResourceID()); } else { - log.error("Can not find container with resource ID {}.", workerNode.getResourceID()); + log.error("Error while calling YARN Node Manager to stop container. Given container is null!"); } return true; } From 567c764eb4abef2d4847ebe946b4723878589b33 Mon Sep 17 00:00:00 2001 From: Sebastian Bauersfeld Date: Fri, 5 Jan 2018 11:24:42 +0000 Subject: [PATCH 2/2] [FLINK-8372] Fix NullPointerException when adding Tasks --- .../apache/flink/runtime/taskexecutor/slot/TaskSlotTable.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/slot/TaskSlotTable.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/slot/TaskSlotTable.java index 799f639cb5615..a4b8df9ced2eb 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/slot/TaskSlotTable.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/slot/TaskSlotTable.java @@ -448,7 +448,7 @@ public boolean addTask(Task task) throws SlotNotFoundException, SlotNotActiveExc throw new SlotNotActiveException(task.getJobID(), task.getAllocationId()); } } else { - throw new SlotNotFoundException(taskSlot.getAllocationId()); + throw new SlotNotFoundException(task.getAllocationId()); } }