This is an automated email from the ASF dual-hosted git repository.

markusthoemmes pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new 9e6dafc  Tweak error message for failing to invoke an action. (#3006)
9e6dafc is described below

commit 9e6dafce285dea6c23fed59597013afe8a32883c
Author: rodric rabbah <[email protected]>
AuthorDate: Mon Dec 4 09:43:31 2017 -0500

    Tweak error message for failing to invoke an action. (#3006)
    
    if its type has changed or cannot be deserialized because of a 
runtime-manifest/schema mismatch with controller
---
 common/scala/src/main/scala/whisk/http/ErrorResponse.scala           | 1 +
 core/invoker/src/main/scala/whisk/core/invoker/InvokerReactive.scala | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/scala/src/main/scala/whisk/http/ErrorResponse.scala 
b/common/scala/src/main/scala/whisk/http/ErrorResponse.scala
index 0feadc5..9ce5c45 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 51246c8..a835d9e 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()

-- 
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].

Reply via email to