[GitHub] markusthoemmes closed pull request #3006: Tweak error message for failing to invoke an action

[GitBox <gi...@apache.org>]

markusthoemmes closed pull request #3006: Tweak error message for failing to invoke an action
URL: https://github.com/apache/incubator-openwhisk/pull/3006
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/common/scala/src/main/scala/whisk/http/ErrorResponse.scala b/common/scala/src/main/scala/whisk/http/ErrorResponse.scala
index 0feadc5c58..9ce5c45561 100644
--- a/common/scala/src/main/scala/whisk/http/ErrorResponse.scala
+++ b/common/scala/src/main/scala/whisk/http/ErrorResponse.scala
@@ -186,6 +186,7 @@ object Messages {
   }
 
   val actionRemovedWhileInvoking = "Action could not be found or may have been deleted."
+  val actionMismatchWhileInvoking = "Action version is not compatible and cannot be invoked."
 }
 
 /** Replaces rejections with Json object containing cause and transaction id. */
diff --git a/core/invoker/src/main/scala/whisk/core/invoker/InvokerReactive.scala b/core/invoker/src/main/scala/whisk/core/invoker/InvokerReactive.scala
index 51246c8f11..a835d9e555 100644
--- a/core/invoker/src/main/scala/whisk/core/invoker/InvokerReactive.scala
+++ b/core/invoker/src/main/scala/whisk/core/invoker/InvokerReactive.scala
@@ -202,7 +202,7 @@ class InvokerReactive(config: WhiskConfig, instance: InstanceId, producer: Messa
               // errors and should cause the invoker to be considered unhealthy.
               val response = t match {
                 case _: NoDocumentException => ActivationResponse.applicationError(Messages.actionRemovedWhileInvoking)
-                case _                      => ActivationResponse.whiskError(Messages.actionRemovedWhileInvoking)
+                case _                      => ActivationResponse.whiskError(Messages.actionMismatchWhileInvoking)
               }
               val now = Instant.now
               val causedBy = if (msg.causedBySequence) Parameters("causedBy", "sequence".toJson) else Parameters()


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services