You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@openwhisk.apache.org by GitBox <gi...@apache.org> on 2017/12/21 18:55:20 UTC
[GitHub] dubeejw closed pull request #3122: Remove redundant property from activation message.
dubeejw closed pull request #3122: Remove redundant property from activation message.
URL: https://github.com/apache/incubator-openwhisk/pull/3122
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/core/connector/Message.scala b/common/scala/src/main/scala/whisk/core/connector/Message.scala
index 3059f6b051..c7cff9fbdb 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 f604e63b33..bf24cbe79d 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 d188ce4ae5..cd80a8ee12 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 b76a60d8c0..dd4336ed9f 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 58005219bb..1a772b9a66 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 6a139374df..25b17b63dd 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 948acf6062..ac8da0f527 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 a4af38ebca..8e7d2911cd 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)
----------------------------------------------------------------
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