Check allocationIdOnLastStatusUpdate when trying to detect whether a task is stale.

martijnvg · martijnvg · commit 68c42fc23f49 · 2018-02-05T13:53:27.000+01:00
diff --git a/server/src/main/java/org/elasticsearch/persistent/PersistentTasksCustomMetaData.java b/server/src/main/java/org/elasticsearch/persistent/PersistentTasksCustomMetaData.java
@@ -366,7 +366,7 @@ public Status getStatus() {
          * to a new executor node and the status hasn't been updated then the task status is stale.
          */
         public boolean isCurrentStatus() {
-            return allocationIdOnLastStatusUpdate == allocationId;
+            return allocationIdOnLastStatusUpdate != null && allocationIdOnLastStatusUpdate == allocationId;
         }
 
         @Override

Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,7 @@ public Status getStatus() {`
`366`	`366`	`* to a new executor node and the status hasn't been updated then the task status is stale.`
`367`	`367`	`*/`
`368`	`368`	`public boolean isCurrentStatus() {`
`369`		`- return allocationIdOnLastStatusUpdate == allocationId;`
	`369`	`+ return allocationIdOnLastStatusUpdate != null && allocationIdOnLastStatusUpdate == allocationId;`
`370`	`370`	`}`
`371`	`371`
`372`	`372`	`@Override`