Merge 3e99442 into 7c94e9b

Author: style95

core/scheduler/src/main/scala/org/apache/openwhisk/core/scheduler/queue/MemoryQueue.scala

@@ -694,13 +694,17 @@ class MemoryQueue(private val etcdClient: EtcdClient,
     cleanUpWatcher()
     cleanUpData()
 
+    context.parent ! queueRemovedMsg
+
     goto(Removed) using NoData()
   }
 
   private def cleanUpActorsAndGotoRemoved(data: FlushingData) = {
     cleanUpActors(data)
     cleanUpData()
 
+    context.parent ! queueRemovedMsg
+
     goto(Removed) using NoData()
   }
 

tests/src/test/scala/org/apache/openwhisk/core/scheduler/queue/test/MemoryQueueTests.scala

@@ -654,13 +654,14 @@ class MemoryQueueTests
     fsm ! StateTimeout
     expectMsg(Transition(fsm, Idle, Removed))
     queueRef.queue.length shouldBe 0
+    parent.expectMsg(queueRemovedMsg)
+
     fsm ! message
 
     // queue is timed out again in the Removed state.
     parent.expectMsg(message)
 
     fsm ! StateTimeout
-    parent.expectMsg(queueRemovedMsg)
 
     expectNoMessage()
 
@@ -1103,10 +1104,7 @@ class MemoryQueueTests
     fsm ! message
     probe.expectMsg(ActivationResponse.developerError("nonExecutbleAction error"))
 
-    parent.expectMsgAnyOf(
-      2 * queueConfig.flushGrace + 5.seconds,
-      QueueRemoved(testInvocationNamespace, fqn.toDocId.asDocInfo(action.rev), Some(leaderKey)),
-      Transition(fsm, Flushing, Removed))
+    parent.expectMsgAllOf(2 * queueConfig.flushGrace + 5.seconds, queueRemovedMsg, Transition(fsm, Flushing, Removed))
 
     fsm ! StateTimeout
     parent.expectMsg(queueRemovedMsg)
@@ -1409,10 +1407,7 @@ class MemoryQueueTests
 
     val duration = FiniteDuration(queueConfig.maxBlackboxRetentionMs, MILLISECONDS) + queueConfig.flushGrace
     probe.expectMsg(duration, ActivationResponse.whiskError("no available invokers"))
-    parent.expectMsgAnyOf(
-      duration,
-      QueueRemoved(testInvocationNamespace, fqn.toDocId.asDocInfo(action.rev), Some(leaderKey)),
-      Transition(fsm, Flushing, Removed))
+    parent.expectMsgAllOf(duration, queueRemovedMsg, Transition(fsm, Flushing, Removed))
     fsm ! QueueRemovedCompleted
     parent.expectTerminated(fsm)