You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by du...@apache.org on 2017/12/21 18:55:19 UTC
[incubator-openwhisk] branch master updated: Remove redundant
property from activation message. (#3122)
This is an automated email from the ASF dual-hosted git repository.
dubeejw 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 566957f Remove redundant property from activation message. (#3122)
566957f is described below
commit 566957fb5c386a47273fdfef33b1b659fe41fe12
Author: rodric rabbah <ro...@gmail.com>
AuthorDate: Thu Dec 21 13:55:16 2017 -0500
Remove redundant property from activation message. (#3122)
---
common/scala/src/main/scala/whisk/core/connector/Message.scala | 4 +---
.../main/scala/whisk/core/controller/actions/PrimitiveActions.scala | 1 -
.../src/main/scala/whisk/core/loadBalancer/InvokerSupervision.scala | 1 -
.../src/main/scala/whisk/core/containerpool/ContainerProxy.scala | 2 +-
core/invoker/src/main/scala/whisk/core/invoker/InvokerReactive.scala | 2 +-
.../test/scala/whisk/core/containerpool/test/ContainerPoolTests.scala | 2 +-
.../scala/whisk/core/containerpool/test/ContainerProxyTests.scala | 1 -
.../scala/whisk/core/loadBalancer/test/InvokerSupervisionTests.scala | 1 -
8 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/common/scala/src/main/scala/whisk/core/connector/Message.scala b/common/scala/src/main/scala/whisk/core/connector/Message.scala
index 3059f6b..c7cff9f 100644
--- a/common/scala/src/main/scala/whisk/core/connector/Message.scala
+++ b/common/scala/src/main/scala/whisk/core/connector/Message.scala
@@ -23,7 +23,6 @@ import spray.json._
import whisk.common.TransactionId
import whisk.core.entity.ActivationId
import whisk.core.entity.DocRevision
-import whisk.core.entity.EntityPath
import whisk.core.entity.FullyQualifiedEntityName
import whisk.core.entity.Identity
import whisk.core.entity.InstanceId
@@ -53,7 +52,6 @@ case class ActivationMessage(override val transid: TransactionId,
revision: DocRevision,
user: Identity,
activationId: ActivationId,
- activationNamespace: EntityPath,
rootControllerIndex: InstanceId,
blocking: Boolean,
content: Option[JsObject],
@@ -84,7 +82,7 @@ object ActivationMessage extends DefaultJsonProtocol {
def parse(msg: String) = Try(serdes.read(msg.parseJson))
private implicit val fqnSerdes = FullyQualifiedEntityName.serdes
- implicit val serdes = jsonFormat10(ActivationMessage.apply)
+ implicit val serdes = jsonFormat9(ActivationMessage.apply)
}
/**
diff --git a/core/controller/src/main/scala/whisk/core/controller/actions/PrimitiveActions.scala b/core/controller/src/main/scala/whisk/core/controller/actions/PrimitiveActions.scala
index f604e63..bf24cbe 100644
--- a/core/controller/src/main/scala/whisk/core/controller/actions/PrimitiveActions.scala
+++ b/core/controller/src/main/scala/whisk/core/controller/actions/PrimitiveActions.scala
@@ -105,7 +105,6 @@ protected[actions] trait PrimitiveActions {
action.rev,
user,
activationIdFactory.make(), // activation id created here
- activationNamespace = user.namespace.toPath,
activeAckTopicIndex,
waitForResponse.isDefined,
args,
diff --git a/core/controller/src/main/scala/whisk/core/loadBalancer/InvokerSupervision.scala b/core/controller/src/main/scala/whisk/core/loadBalancer/InvokerSupervision.scala
index d188ce4..cd80a8e 100644
--- a/core/controller/src/main/scala/whisk/core/loadBalancer/InvokerSupervision.scala
+++ b/core/controller/src/main/scala/whisk/core/loadBalancer/InvokerSupervision.scala
@@ -328,7 +328,6 @@ class InvokerActor(invokerInstance: InstanceId, controllerInstance: InstanceId)
user = InvokerPool.healthActionIdentity,
// Create a new Activation ID for this activation
activationId = new ActivationIdGenerator {}.make(),
- activationNamespace = action.namespace,
rootControllerIndex = controllerInstance,
blocking = false,
content = None)
diff --git a/core/invoker/src/main/scala/whisk/core/containerpool/ContainerProxy.scala b/core/invoker/src/main/scala/whisk/core/containerpool/ContainerProxy.scala
index b76a60d..dd4336e 100644
--- a/core/invoker/src/main/scala/whisk/core/containerpool/ContainerProxy.scala
+++ b/core/invoker/src/main/scala/whisk/core/containerpool/ContainerProxy.scala
@@ -455,7 +455,7 @@ object ContainerProxy {
WhiskActivation(
activationId = job.msg.activationId,
- namespace = job.msg.activationNamespace,
+ namespace = job.msg.user.namespace.toPath,
subject = job.msg.user.subject,
cause = job.msg.cause,
name = job.action.name,
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 5800521..1a772b9 100644
--- a/core/invoker/src/main/scala/whisk/core/invoker/InvokerReactive.scala
+++ b/core/invoker/src/main/scala/whisk/core/invoker/InvokerReactive.scala
@@ -210,7 +210,7 @@ class InvokerReactive(config: WhiskConfig, instance: InstanceId, producer: Messa
} else None
val activation = WhiskActivation(
activationId = msg.activationId,
- namespace = msg.activationNamespace,
+ namespace = msg.user.namespace.toPath,
subject = msg.user.subject,
cause = msg.cause,
name = msg.action.name,
diff --git a/tests/src/test/scala/whisk/core/containerpool/test/ContainerPoolTests.scala b/tests/src/test/scala/whisk/core/containerpool/test/ContainerPoolTests.scala
index 6a13937..25b17b6 100644
--- a/tests/src/test/scala/whisk/core/containerpool/test/ContainerPoolTests.scala
+++ b/tests/src/test/scala/whisk/core/containerpool/test/ContainerPoolTests.scala
@@ -77,7 +77,6 @@ class ContainerPoolTests
action.rev,
Identity(Subject(), invocationNamespace, AuthKey(), Set()),
ActivationId(),
- invocationNamespace.toPath,
InstanceId(0),
blocking = false,
content = None)
@@ -90,6 +89,7 @@ class ContainerPoolTests
val differentAction = action.copy(name = EntityName("actionName2"))
val runMessage = createRunMessage(action, invocationNamespace)
+ val runMessageDifferentAction = createRunMessage(differentAction, invocationNamespace)
val runMessageDifferentNamespace = createRunMessage(action, differentInvocationNamespace)
val runMessageDifferentEverything = createRunMessage(differentAction, differentInvocationNamespace)
diff --git a/tests/src/test/scala/whisk/core/containerpool/test/ContainerProxyTests.scala b/tests/src/test/scala/whisk/core/containerpool/test/ContainerProxyTests.scala
index 948acf6..ac8da0f 100644
--- a/tests/src/test/scala/whisk/core/containerpool/test/ContainerProxyTests.scala
+++ b/tests/src/test/scala/whisk/core/containerpool/test/ContainerProxyTests.scala
@@ -97,7 +97,6 @@ class ContainerProxyTests
action.rev,
Identity(Subject(), invocationNamespace, AuthKey(), Set()),
ActivationId(),
- invocationNamespace.toPath,
InstanceId(0),
blocking = false,
content = None)
diff --git a/tests/src/test/scala/whisk/core/loadBalancer/test/InvokerSupervisionTests.scala b/tests/src/test/scala/whisk/core/loadBalancer/test/InvokerSupervisionTests.scala
index a4af38e..8e7d291 100644
--- a/tests/src/test/scala/whisk/core/loadBalancer/test/InvokerSupervisionTests.scala
+++ b/tests/src/test/scala/whisk/core/loadBalancer/test/InvokerSupervisionTests.scala
@@ -198,7 +198,6 @@ class InvokerSupervisionTests
AuthKey(UUID(), Secret()),
Set[Privilege]()),
activationId = new ActivationIdGenerator {}.make(),
- activationNamespace = EntityPath("guest"),
rootControllerIndex = InstanceId(0),
blocking = false,
content = None)
--
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].