This is an automated email from the ASF dual-hosted git repository.
dgrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new 368dd8017 Fix spelling (#5516)
368dd8017 is described below
commit 368dd8017a5c0f16610950f1a08b877042f79db4
Author: John Bampton <[email protected]>
AuthorDate: Sat Oct 19 03:52:00 2024 +1000
Fix spelling (#5516)
---
.../scala/org/apache/openwhisk/core/ack/Ack.scala | 8 +++----
.../openwhisk/core/ack/HealthActionAck.scala | 4 ++--
.../openwhisk/core/ack/MessagingActiveAck.scala | 16 ++++++-------
.../apache/openwhisk/core/connector/Message.scala | 26 +++++++++++-----------
.../apache/openwhisk/core/entity/WhiskEntity.scala | 2 +-
.../core/loadBalancer/CommonLoadBalancer.scala | 18 +++++++--------
.../core/loadBalancer/FPCPoolBalancer.scala | 18 +++++++--------
tests/performance/README.md | 2 +-
.../openwhisk/ColdBlockingInvokeSimulation.scala | 2 +-
.../tests/AcknowledgementMessageTests.scala | 16 ++++++-------
.../containerpool/test/ContainerProxyTests.scala | 16 ++++++-------
.../test/FunctionPullingContainerProxyTests.scala | 18 +++++++--------
.../scheduler/queue/test/MemoryQueueTests.scala | 4 ++--
.../queue/test/MemoryQueueTestsFixture.scala | 4 ++--
.../scheduler/queue/test/QueueManagerTests.scala | 12 +++++-----
15 files changed, 83 insertions(+), 83 deletions(-)
diff --git
a/common/scala/src/main/scala/org/apache/openwhisk/core/ack/Ack.scala
b/common/scala/src/main/scala/org/apache/openwhisk/core/ack/Ack.scala
index 6509602ab..852340724 100644
--- a/common/scala/src/main/scala/org/apache/openwhisk/core/ack/Ack.scala
+++ b/common/scala/src/main/scala/org/apache/openwhisk/core/ack/Ack.scala
@@ -17,7 +17,7 @@
package org.apache.openwhisk.core.ack
import org.apache.openwhisk.common.{TransactionId, UserEvents}
-import org.apache.openwhisk.core.connector.{AcknowledegmentMessage,
EventMessage, MessageProducer}
+import org.apache.openwhisk.core.connector.{AcknowledgementMessage,
EventMessage, MessageProducer}
import org.apache.openwhisk.core.entity.{ControllerInstanceId, UUID,
WhiskActivation}
import scala.concurrent.Future
@@ -27,7 +27,7 @@ import scala.concurrent.Future
* are either completion messages for an activation to indicate a resource
slot is free, or result-forwarding
* messages for continuations (e.g., sequences and conductor actions).
*
- * The activation result is always provided because some acknowledegment
messages may not carry the result of
+ * The activation result is always provided because some acknowledgement
messages may not carry the result of
* the activation and this is needed for sending user events.
*
* @param tid the transaction id for the activation
@@ -35,7 +35,7 @@ import scala.concurrent.Future
* @param blockingInvoke is true iff the activation was a blocking request
* @param controllerInstance the originating controller/loadbalancer id
* @param userId is the UUID for the namespace owning the activation
- * @param acknowledegment the acknowledgement message to send
+ * @param acknowledgement the acknowledgement message to send
*/
trait ActiveAck {
def apply(tid: TransactionId,
@@ -43,7 +43,7 @@ trait ActiveAck {
blockingInvoke: Boolean,
controllerInstance: ControllerInstanceId,
userId: UUID,
- acknowledegment: AcknowledegmentMessage): Future[Any]
+ acknowledgement: AcknowledgementMessage): Future[Any]
}
trait EventSender {
diff --git
a/common/scala/src/main/scala/org/apache/openwhisk/core/ack/HealthActionAck.scala
b/common/scala/src/main/scala/org/apache/openwhisk/core/ack/HealthActionAck.scala
index 83c4acd3b..3ae9e02e6 100644
---
a/common/scala/src/main/scala/org/apache/openwhisk/core/ack/HealthActionAck.scala
+++
b/common/scala/src/main/scala/org/apache/openwhisk/core/ack/HealthActionAck.scala
@@ -18,7 +18,7 @@
package org.apache.openwhisk.core.ack
import org.apache.openwhisk.common.{Logging, TransactionId}
-import org.apache.openwhisk.core.connector.{AcknowledegmentMessage,
MessageProducer}
+import org.apache.openwhisk.core.connector.{AcknowledgementMessage,
MessageProducer}
import org.apache.openwhisk.core.entity.{ControllerInstanceId, UUID,
WhiskActivation}
import spray.json.DefaultJsonProtocol._
@@ -30,7 +30,7 @@ class HealthActionAck(producer: MessageProducer)(implicit
logging: Logging, ec:
blockingInvoke: Boolean,
controllerInstance: ControllerInstanceId,
userId: UUID,
- acknowledegment: AcknowledegmentMessage): Future[Any] = {
+ acknowledgement: AcknowledgementMessage): Future[Any] = {
implicit val transid: TransactionId = tid
logging.debug(this, s"health action was successfully invoked")
diff --git
a/common/scala/src/main/scala/org/apache/openwhisk/core/ack/MessagingActiveAck.scala
b/common/scala/src/main/scala/org/apache/openwhisk/core/ack/MessagingActiveAck.scala
index b798d884a..a0beb1cfe 100644
---
a/common/scala/src/main/scala/org/apache/openwhisk/core/ack/MessagingActiveAck.scala
+++
b/common/scala/src/main/scala/org/apache/openwhisk/core/ack/MessagingActiveAck.scala
@@ -20,7 +20,7 @@ package org.apache.openwhisk.core.ack
import org.apache.kafka.common.errors.RecordTooLargeException
import org.apache.openwhisk.common.{Logging, TransactionId}
import org.apache.openwhisk.core.ConfigKeys
-import org.apache.openwhisk.core.connector.{AcknowledegmentMessage,
EventMessage, MessageProducer}
+import org.apache.openwhisk.core.connector.{AcknowledgementMessage,
EventMessage, MessageProducer}
import org.apache.openwhisk.core.entity._
import pureconfig._
import scala.concurrent.{ExecutionContext, Future}
@@ -38,19 +38,19 @@ class MessagingActiveAck(producer: MessageProducer,
instance: InstanceId, eventS
blockingInvoke: Boolean,
controllerInstance: ControllerInstanceId,
userId: UUID,
- acknowledegment: AcknowledegmentMessage): Future[Any] = {
+ acknowledgement: AcknowledgementMessage): Future[Any] = {
implicit val transid: TransactionId = tid
- def send(msg: AcknowledegmentMessage, recovery: Boolean = false) = {
+ def send(msg: AcknowledgementMessage, recovery: Boolean = false) = {
producer.send(topic = topicPrefix + "completed" +
controllerInstance.asString, msg).andThen {
case Success(_) =>
val info = if (recovery) s"recovery ${msg.messageType}" else
msg.messageType
- logging.info(this, s"posted $info of activation
${acknowledegment.activationId}")
+ logging.info(this, s"posted $info of activation
${acknowledgement.activationId}")
}
}
// UserMetrics are sent, when the slot is free again. This ensures, that
all metrics are sent.
- if (acknowledegment.isSlotFree.nonEmpty) {
+ if (acknowledgement.isSlotFree.nonEmpty) {
eventSender.foreach { s =>
EventMessage.from(activationResult, instance.source, userId) match {
case Success(msg) => s.send(msg)
@@ -62,10 +62,10 @@ class MessagingActiveAck(producer: MessageProducer,
instance: InstanceId, eventS
// An acknowledgement containing the result is only needed for blocking
invokes in order to further the
// continuation. A result message for a non-blocking activation is not
actually registered in the load balancer
// and the container proxy should not send such an acknowlegement unless
it's a blocking request. Here the code
- // is defensive and will shrink all non-blocking acknowledegments.
- send(if (blockingInvoke) acknowledegment else
acknowledegment.shrink).recoverWith {
+ // is defensive and will shrink all non-blocking acknowledgements.
+ send(if (blockingInvoke) acknowledgement else
acknowledgement.shrink).recoverWith {
case t if t.getCause.isInstanceOf[RecordTooLargeException] =>
- send(acknowledegment.shrink, recovery = true)
+ send(acknowledgement.shrink, recovery = true)
}
}
}
diff --git
a/common/scala/src/main/scala/org/apache/openwhisk/core/connector/Message.scala
b/common/scala/src/main/scala/org/apache/openwhisk/core/connector/Message.scala
index 9de194798..85acdd8e0 100644
---
a/common/scala/src/main/scala/org/apache/openwhisk/core/connector/Message.scala
+++
b/common/scala/src/main/scala/org/apache/openwhisk/core/connector/Message.scala
@@ -78,10 +78,10 @@ case class ActivationMessage(override val transid:
TransactionId,
* Message that is sent from the invoker to the controller after action is
completed or after slot is free again for
* new actions.
*/
-abstract class AcknowledegmentMessage(private val tid: TransactionId) extends
Message {
+abstract class AcknowledgementMessage(private val tid: TransactionId) extends
Message {
override val transid: TransactionId = tid
- override def serialize: String =
AcknowledegmentMessage.serdes.write(this).compactPrint
+ override def serialize: String =
AcknowledgementMessage.serdes.write(this).compactPrint
/** Pithy descriptor for logging. */
def messageType: String
@@ -106,7 +106,7 @@ abstract class AcknowledegmentMessage(private val tid:
TransactionId) extends Me
/**
* Converts the message to a more compact form if it cannot cross the
message bus as is or some of its details are not necessary.
*/
- def shrink: AcknowledegmentMessage
+ def shrink: AcknowledgementMessage
}
/**
@@ -122,7 +122,7 @@ case class CombinedCompletionAndResultMessage private
(override val transid: Tra
response:
Either[ActivationId, WhiskActivation],
override val
isSystemError: Option[Boolean],
instance: InstanceId)
- extends AcknowledegmentMessage(transid) {
+ extends AcknowledgementMessage(transid) {
override def messageType = "combined"
override def result = Some(response)
@@ -148,7 +148,7 @@ case class CompletionMessage private (override val transid:
TransactionId,
override val activationId: ActivationId,
override val isSystemError:
Option[Boolean],
instance: InstanceId)
- extends AcknowledegmentMessage(transid) {
+ extends AcknowledgementMessage(transid) {
override def messageType = "completion"
override def result = None
@@ -171,7 +171,7 @@ case class CompletionMessage private (override val transid:
TransactionId,
* Right when this message is created.
*/
case class ResultMessage private (override val transid: TransactionId,
response: Either[ActivationId, WhiskActivation])
- extends AcknowledegmentMessage(transid) {
+ extends AcknowledgementMessage(transid) {
override def messageType = "result"
override def result = Some(response)
@@ -209,7 +209,7 @@ object CombinedCompletionAndResultMessage extends
DefaultJsonProtocol {
instance: InstanceId): CombinedCompletionAndResultMessage =
new CombinedCompletionAndResultMessage(transid, Right(activation),
Some(activation.response.isWhiskError), instance)
- implicit private val eitherSerdes = AcknowledegmentMessage.eitherResponse
+ implicit private val eitherSerdes = AcknowledgementMessage.eitherResponse
implicit val serdes = jsonFormat4(
CombinedCompletionAndResultMessage
.apply(_: TransactionId, _: Either[ActivationId, WhiskActivation], _:
Option[Boolean], _: InstanceId))
@@ -239,12 +239,12 @@ object ResultMessage extends DefaultJsonProtocol {
def apply(transid: TransactionId, activation: WhiskActivation):
ResultMessage =
new ResultMessage(transid, Right(activation))
- implicit private val eitherSerdes = AcknowledegmentMessage.eitherResponse
+ implicit private val eitherSerdes = AcknowledgementMessage.eitherResponse
implicit val serdes = jsonFormat2(ResultMessage.apply(_: TransactionId, _:
Either[ActivationId, WhiskActivation]))
}
-object AcknowledegmentMessage extends DefaultJsonProtocol {
- def parse(msg: String): Try[AcknowledegmentMessage] =
Try(serdes.read(msg.parseJson))
+object AcknowledgementMessage extends DefaultJsonProtocol {
+ def parse(msg: String): Try[AcknowledgementMessage] =
Try(serdes.read(msg.parseJson))
protected[connector] val eitherResponse = new
JsonFormat[Either[ActivationId, WhiskActivation]] {
def write(either: Either[ActivationId, WhiskActivation]) =
either.fold(_.toJson, _.toJson)
@@ -259,13 +259,13 @@ object AcknowledegmentMessage extends DefaultJsonProtocol
{
}
}
- implicit val serdes = new RootJsonFormat[AcknowledegmentMessage] {
- override def write(m: AcknowledegmentMessage): JsValue = m.toJson
+ implicit val serdes = new RootJsonFormat[AcknowledgementMessage] {
+ override def write(m: AcknowledgementMessage): JsValue = m.toJson
// The field invoker is only part of CombinedCompletionAndResultMessage
and CompletionMessage.
// If this field is part of the JSON, we try to deserialize into one of
these two types,
// and otherwise to a ResultMessage. If all conversions fail, an error
will be thrown that needs to be handled.
- override def read(json: JsValue): AcknowledegmentMessage = {
+ override def read(json: JsValue): AcknowledgementMessage = {
val JsObject(fields) = json
val completion = fields.contains("instance")
val result = fields.contains("response")
diff --git
a/common/scala/src/main/scala/org/apache/openwhisk/core/entity/WhiskEntity.scala
b/common/scala/src/main/scala/org/apache/openwhisk/core/entity/WhiskEntity.scala
index a3630a5a3..a655c2936 100644
---
a/common/scala/src/main/scala/org/apache/openwhisk/core/entity/WhiskEntity.scala
+++
b/common/scala/src/main/scala/org/apache/openwhisk/core/entity/WhiskEntity.scala
@@ -84,7 +84,7 @@ abstract class WhiskEntity protected[entity] (en: EntityName,
val entityType: St
/**
* A JSON view of the entity, that should match the result returned in a
list operation.
- * This should be synchronized with the views computed in the databse.
+ * This should be synchronized with the views computed in the database.
* Strictly used in view testing to enforce alignment.
*/
def summaryAsJson: JsObject = {
diff --git
a/core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/CommonLoadBalancer.scala
b/core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/CommonLoadBalancer.scala
index 1a204cf42..2a002876d 100644
---
a/core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/CommonLoadBalancer.scala
+++
b/core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/CommonLoadBalancer.scala
@@ -219,19 +219,19 @@ abstract class CommonLoadBalancer(config: WhiskConfig,
/** 4. Get the ack message and parse it */
protected[loadBalancer] def processAcknowledgement(bytes: Array[Byte]):
Future[Unit] = Future {
val raw = new String(bytes, StandardCharsets.UTF_8)
- AcknowledegmentMessage.parse(raw) match {
- case Success(acknowledegment) =>
- acknowledegment.isSlotFree.foreach { instance =>
+ AcknowledgementMessage.parse(raw) match {
+ case Success(acknowledgement) =>
+ acknowledgement.isSlotFree.foreach { instance =>
processCompletion(
- acknowledegment.activationId,
- acknowledegment.transid,
+ acknowledgement.activationId,
+ acknowledgement.transid,
forced = false,
- isSystemError = acknowledegment.isSystemError.getOrElse(false),
+ isSystemError = acknowledgement.isSystemError.getOrElse(false),
instance)
}
- acknowledegment.result.foreach { response =>
- processResult(acknowledegment.activationId, acknowledegment.transid,
response)
+ acknowledgement.result.foreach { response =>
+ processResult(acknowledgement.activationId, acknowledgement.transid,
response)
}
activationFeed ! MessageFeed.Processed
@@ -242,7 +242,7 @@ abstract class CommonLoadBalancer(config: WhiskConfig,
case _ =>
activationFeed ! MessageFeed.Processed
- logging.error(this, s"Unexpected Acknowledgment message received by
loadbalancer: $raw")
+ logging.error(this, s"Unexpected Acknowledgement message received by
loadbalancer: $raw")
}
}
diff --git
a/core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/FPCPoolBalancer.scala
b/core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/FPCPoolBalancer.scala
index 84bdc027f..0889cf2f5 100644
---
a/core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/FPCPoolBalancer.scala
+++
b/core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/FPCPoolBalancer.scala
@@ -295,18 +295,18 @@ class FPCPoolBalancer(config: WhiskConfig,
/** 4. Get the active-ack message and parse it */
protected[loadBalancer] def processAcknowledgement(bytes: Array[Byte]):
Future[Unit] = Future {
val raw = new String(bytes, StandardCharsets.UTF_8)
- AcknowledegmentMessage.parse(raw) match {
- case Success(acknowledegment) =>
- acknowledegment.isSlotFree.foreach { invoker =>
+ AcknowledgementMessage.parse(raw) match {
+ case Success(acknowledgement) =>
+ acknowledgement.isSlotFree.foreach { invoker =>
processCompletion(
- acknowledegment.activationId,
- acknowledegment.transid,
+ acknowledgement.activationId,
+ acknowledgement.transid,
forced = false,
- isSystemError = acknowledegment.isSystemError.getOrElse(false))
+ isSystemError = acknowledgement.isSystemError.getOrElse(false))
}
- acknowledegment.result.foreach { response =>
- processResult(acknowledegment.activationId, acknowledegment.transid,
response)
+ acknowledgement.result.foreach { response =>
+ processResult(acknowledgement.activationId, acknowledgement.transid,
response)
}
activationFeed ! MessageFeed.Processed
@@ -316,7 +316,7 @@ class FPCPoolBalancer(config: WhiskConfig,
case _ =>
activationFeed ! MessageFeed.Processed
- logging.warn(this, s"Unexpected Acknowledgment message received by
loadbalancer: $raw")
+ logging.warn(this, s"Unexpected Acknowledgement message received by
loadbalancer: $raw")
}
}
diff --git a/tests/performance/README.md b/tests/performance/README.md
index 202ef2ed2..160a940cf 100644
--- a/tests/performance/README.md
+++ b/tests/performance/README.md
@@ -93,7 +93,7 @@ Next, the action will be invoked 100 times blocking and one
after each other. Be
`PAUSE_BETWEEN_INVOKES` milliseconds. The last step is to delete the action.
Once one language is finished, the next kind will be taken. They are not
running in parallel. There are never more than
-1 activations in the system, as we only want to meassure latency of warm
activations.
+1 activations in the system, as we only want to measure latency of warm
activations.
As all actions are invoked blocking and only one action is in the system, it
doesn't matter how many controllers
and invokers are deployed. If several controllers or invokers are deployed,
all controllers send the activation
always to the same invoker.
diff --git
a/tests/performance/gatling_tests/src/gatling/scala/org/apache/openwhisk/ColdBlockingInvokeSimulation.scala
b/tests/performance/gatling_tests/src/gatling/scala/org/apache/openwhisk/ColdBlockingInvokeSimulation.scala
index 610c8ed5f..8904db258 100644
---
a/tests/performance/gatling_tests/src/gatling/scala/org/apache/openwhisk/ColdBlockingInvokeSimulation.scala
+++
b/tests/performance/gatling_tests/src/gatling/scala/org/apache/openwhisk/ColdBlockingInvokeSimulation.scala
@@ -71,7 +71,7 @@ class ColdBlockingInvokeSimulation extends Simulation {
// Execute all actions for the given amount of time.
.during(seconds) {
// Cycle through the actions of this user, to not invoke the same
action directly one after each other.
- // Otherwise there is the possiblity, that it is warm.
+ // Otherwise there is the possibility, that it is warm.
repeat(actionsPerUser, "i") {
exec(openWhisk("Invoke action").authenticate(uuid,
key).action(actionName).invoke())
}
diff --git
a/tests/src/test/scala/org/apache/openwhisk/core/connector/tests/AcknowledgementMessageTests.scala
b/tests/src/test/scala/org/apache/openwhisk/core/connector/tests/AcknowledgementMessageTests.scala
index 5216bb8b8..33f52e394 100644
---
a/tests/src/test/scala/org/apache/openwhisk/core/connector/tests/AcknowledgementMessageTests.scala
+++
b/tests/src/test/scala/org/apache/openwhisk/core/connector/tests/AcknowledgementMessageTests.scala
@@ -23,7 +23,7 @@ import org.scalatest.junit.JUnitRunner
import spray.json._
import org.apache.openwhisk.common.{TransactionId, WhiskInstants}
import org.apache.openwhisk.core.connector.{
- AcknowledegmentMessage,
+ AcknowledgementMessage,
CombinedCompletionAndResultMessage,
CompletionMessage,
ResultMessage
@@ -60,7 +60,7 @@ class AcknowledgementMessageTests extends FlatSpec with
Matchers with WhiskInsta
m.isSlotFree shouldBe empty
m.serialize shouldBe JsObject("transid" -> m.transid.toJson, "response" ->
m.response.left.get.toJson).compactPrint
m.serialize shouldBe m.toJson.compactPrint
- AcknowledegmentMessage.parse(m.serialize) shouldBe Success(m)
+ AcknowledgementMessage.parse(m.serialize) shouldBe Success(m)
}
it should "serialize and deserialize a Result message with Right result" in {
@@ -68,7 +68,7 @@ class AcknowledgementMessageTests extends FlatSpec with
Matchers with WhiskInsta
m.response shouldBe 'right
m.isSlotFree shouldBe empty
m.serialize shouldBe JsObject("transid" -> m.transid.toJson, "response" ->
m.response.right.get.toJson).compactPrint
- AcknowledegmentMessage.parse(m.serialize) shouldBe Success(m)
+ AcknowledgementMessage.parse(m.serialize) shouldBe Success(m)
}
it should "serialize and deserialize a Completion message" in {
@@ -79,7 +79,7 @@ class AcknowledgementMessageTests extends FlatSpec with
Matchers with WhiskInsta
InvokerInstanceId(0, userMemory = defaultUserMemory))
m.isSlotFree should not be empty
m.serialize shouldBe m.toJson.compactPrint
- AcknowledegmentMessage.parse(m.serialize) shouldBe Success(m)
+ AcknowledgementMessage.parse(m.serialize) shouldBe Success(m)
}
it should "serialize and deserialize a CombinedCompletionAndResultMessage"
in {
@@ -92,7 +92,7 @@ class AcknowledgementMessageTests extends FlatSpec with
Matchers with WhiskInsta
c.isSlotFree should not be empty
c.isSystemError shouldBe Some(false)
c.serialize shouldBe c.toJson.compactPrint
- AcknowledegmentMessage.parse(c.serialize) shouldBe Success(c)
+ AcknowledgementMessage.parse(c.serialize) shouldBe Success(c)
}
withClue("system error true and right") {
@@ -106,7 +106,7 @@ class AcknowledgementMessageTests extends FlatSpec with
Matchers with WhiskInsta
c.isSlotFree should not be empty
c.isSystemError shouldBe Some(true)
c.serialize shouldBe c.toJson.compactPrint
- AcknowledegmentMessage.parse(c.serialize) shouldBe Success(c)
+ AcknowledgementMessage.parse(c.serialize) shouldBe Success(c)
}
withClue("system error false and left") {
@@ -118,7 +118,7 @@ class AcknowledgementMessageTests extends FlatSpec with
Matchers with WhiskInsta
c.isSlotFree should not be empty
c.isSystemError shouldBe Some(false)
c.serialize shouldBe c.toJson.compactPrint
- AcknowledegmentMessage.parse(c.serialize) shouldBe Success(c)
+ AcknowledgementMessage.parse(c.serialize) shouldBe Success(c)
}
withClue("system error true and left") {
@@ -132,7 +132,7 @@ class AcknowledgementMessageTests extends FlatSpec with
Matchers with WhiskInsta
c.isSlotFree should not be empty
c.isSystemError shouldBe Some(true)
c.serialize shouldBe c.toJson.compactPrint
- AcknowledegmentMessage.parse(c.serialize) shouldBe Success(c)
+ AcknowledgementMessage.parse(c.serialize) shouldBe Success(c)
}
}
}
diff --git
a/tests/src/test/scala/org/apache/openwhisk/core/containerpool/test/ContainerProxyTests.scala
b/tests/src/test/scala/org/apache/openwhisk/core/containerpool/test/ContainerProxyTests.scala
index e29eb15e5..f8f856e41 100644
---
a/tests/src/test/scala/org/apache/openwhisk/core/containerpool/test/ContainerProxyTests.scala
+++
b/tests/src/test/scala/org/apache/openwhisk/core/containerpool/test/ContainerProxyTests.scala
@@ -38,7 +38,7 @@ import spray.json._
import org.apache.openwhisk.common.{Logging, TransactionId}
import org.apache.openwhisk.core.ack.ActiveAck
import org.apache.openwhisk.core.connector.{
- AcknowledegmentMessage,
+ AcknowledgementMessage,
ActivationMessage,
CombinedCompletionAndResultMessage,
CompletionMessage,
@@ -177,7 +177,7 @@ class ContainerProxyTests
trait LoggedAcker extends ActiveAck {
def calls =
- mutable.Buffer[(TransactionId, WhiskActivation, Boolean,
ControllerInstanceId, UUID, AcknowledegmentMessage)]()
+ mutable.Buffer[(TransactionId, WhiskActivation, Boolean,
ControllerInstanceId, UUID, AcknowledgementMessage)]()
def verifyAnnotations(activation: WhiskActivation, a:
ExecutableWhiskAction) = {
activation.annotations.get("limits") shouldBe Some(a.limits.toJson)
@@ -194,7 +194,7 @@ class ContainerProxyTests
_: Boolean,
_: ControllerInstanceId,
_: UUID,
- _: AcknowledegmentMessage) =>
+ _: AcknowledgementMessage) =>
Future.successful(())
}
@@ -205,9 +205,9 @@ class ContainerProxyTests
blockingInvoke: Boolean,
controllerInstance: ControllerInstanceId,
userId: UUID,
- acknowledegment: AcknowledegmentMessage): Future[Any] =
{
+ acknowledgement: AcknowledgementMessage): Future[Any] =
{
verifyAnnotations(activation, a)
- acker(tid, activation, blockingInvoke, controllerInstance, userId,
acknowledegment)
+ acker(tid, activation, blockingInvoke, controllerInstance, userId,
acknowledgement)
}
}
@@ -219,7 +219,7 @@ class ContainerProxyTests
_: Boolean,
_: ControllerInstanceId,
_: UUID,
- _: AcknowledegmentMessage) =>
+ _: AcknowledgementMessage) =>
Future.successful(())
}
@@ -230,9 +230,9 @@ class ContainerProxyTests
blockingInvoke: Boolean,
controllerInstance: ControllerInstanceId,
userId: UUID,
- acknowledegment: AcknowledegmentMessage): Future[Any] =
{
+ acknowledgement: AcknowledgementMessage): Future[Any] =
{
verifyAnnotations(activation, a)
- acker(tid, activation, blockingInvoke, controllerInstance, userId,
acknowledegment)
+ acker(tid, activation, blockingInvoke, controllerInstance, userId,
acknowledgement)
}
}
diff --git
a/tests/src/test/scala/org/apache/openwhisk/core/containerpool/v2/test/FunctionPullingContainerProxyTests.scala
b/tests/src/test/scala/org/apache/openwhisk/core/containerpool/v2/test/FunctionPullingContainerProxyTests.scala
index 3200aeed9..b80f7307f 100644
---
a/tests/src/test/scala/org/apache/openwhisk/core/containerpool/v2/test/FunctionPullingContainerProxyTests.scala
+++
b/tests/src/test/scala/org/apache/openwhisk/core/containerpool/v2/test/FunctionPullingContainerProxyTests.scala
@@ -29,7 +29,7 @@ import com.ibm.etcd.client.{EtcdClient => Client}
import common.{LoggedFunction, StreamLogging, SynchronizedLoggedFunction}
import org.apache.openwhisk.common.{GracefulShutdown, Logging, TransactionId}
import org.apache.openwhisk.core.ack.ActiveAck
-import org.apache.openwhisk.core.connector.{AcknowledegmentMessage,
ActivationMessage}
+import org.apache.openwhisk.core.connector.{AcknowledgementMessage,
ActivationMessage}
import org.apache.openwhisk.core.containerpool.logging.LogCollectingException
import org.apache.openwhisk.core.containerpool.v2._
import org.apache.openwhisk.core.containerpool.{
@@ -228,7 +228,7 @@ class FunctionPullingContainerProxyTests
trait LoggedAcker extends ActiveAck {
def calls =
- mutable.Buffer[(TransactionId, WhiskActivation, Boolean,
ControllerInstanceId, UUID, AcknowledegmentMessage)]()
+ mutable.Buffer[(TransactionId, WhiskActivation, Boolean,
ControllerInstanceId, UUID, AcknowledgementMessage)]()
def verifyAnnotations(activation: WhiskActivation, a:
ExecutableWhiskAction) = {
activation.annotations.get("limits") shouldBe Some(a.limits.toJson)
@@ -240,7 +240,7 @@ class FunctionPullingContainerProxyTests
/** Creates an inspectable version of the ack method, which records all
calls in a buffer */
def createAcker(a: ExecutableWhiskAction = action) = new LoggedAcker {
val acker = LoggedFunction {
- (_: TransactionId, _: WhiskActivation, _: Boolean, _:
ControllerInstanceId, _: UUID, _: AcknowledegmentMessage) =>
+ (_: TransactionId, _: WhiskActivation, _: Boolean, _:
ControllerInstanceId, _: UUID, _: AcknowledgementMessage) =>
Future.successful(())
}
@@ -251,9 +251,9 @@ class FunctionPullingContainerProxyTests
blockingInvoke: Boolean,
controllerInstance: ControllerInstanceId,
userId: UUID,
- acknowledegment: AcknowledegmentMessage): Future[Any] =
{
+ acknowledgement: AcknowledgementMessage): Future[Any] =
{
verifyAnnotations(activation, a)
- acker(tid, activation, blockingInvoke, controllerInstance, userId,
acknowledegment)
+ acker(tid, activation, blockingInvoke, controllerInstance, userId,
acknowledgement)
}
}
@@ -261,7 +261,7 @@ class FunctionPullingContainerProxyTests
def createAckerForNamespaceBlacklist(a: ExecutableWhiskAction = action,
mockNamespaceBlacklist:
MockNamespaceBlacklist) = new LoggedAcker {
val acker = SynchronizedLoggedFunction {
- (_: TransactionId, _: WhiskActivation, _: Boolean, _:
ControllerInstanceId, _: UUID, _: AcknowledegmentMessage) =>
+ (_: TransactionId, _: WhiskActivation, _: Boolean, _:
ControllerInstanceId, _: UUID, _: AcknowledgementMessage) =>
Future.successful(())
}
@@ -276,9 +276,9 @@ class FunctionPullingContainerProxyTests
blockingInvoke: Boolean,
controllerInstance: ControllerInstanceId,
userId: UUID,
- acknowledegment: AcknowledegmentMessage): Future[Any] =
{
+ acknowledgement: AcknowledgementMessage): Future[Any] =
{
verifyAnnotations(activation, a)
- acker(tid, activation, blockingInvoke, controllerInstance, userId,
acknowledegment)
+ acker(tid, activation, blockingInvoke, controllerInstance, userId,
acknowledgement)
}
}
@@ -673,7 +673,7 @@ class FunctionPullingContainerProxyTests
}
}
- it should "not run activations and destory the prewarm container when get
client failed" in within(timeout) {
+ it should "not run activations and destroy the prewarm container when get
client failed" in within(timeout) {
val authStore = mock[ArtifactWhiskAuthStore]
val namespaceBlacklist: NamespaceBlacklist = new
NamespaceBlacklist(authStore)
val get = getWhiskAction(Future(action.toWhiskAction))
diff --git
a/tests/src/test/scala/org/apache/openwhisk/core/scheduler/queue/test/MemoryQueueTests.scala
b/tests/src/test/scala/org/apache/openwhisk/core/scheduler/queue/test/MemoryQueueTests.scala
index 68891c1f9..8f3d69f50 100644
---
a/tests/src/test/scala/org/apache/openwhisk/core/scheduler/queue/test/MemoryQueueTests.scala
+++
b/tests/src/test/scala/org/apache/openwhisk/core/scheduler/queue/test/MemoryQueueTests.scala
@@ -1048,7 +1048,7 @@ class MemoryQueueTests
blockingInvoke: Boolean,
controllerInstance: ControllerInstanceId,
userId: UUID,
- acknowledegment: AcknowledegmentMessage): Future[Any]
= {
+ acknowledgement: AcknowledgementMessage): Future[Any]
= {
probe.ref ! activationResult.response
Future.successful({})
}
@@ -1328,7 +1328,7 @@ class MemoryQueueTests
blockingInvoke: Boolean,
controllerInstance: ControllerInstanceId,
userId: UUID,
- acknowledegment: AcknowledegmentMessage): Future[Any]
= {
+ acknowledgement: AcknowledgementMessage): Future[Any]
= {
probe.ref ! activationResult.response
Future.successful({})
}
diff --git
a/tests/src/test/scala/org/apache/openwhisk/core/scheduler/queue/test/MemoryQueueTestsFixture.scala
b/tests/src/test/scala/org/apache/openwhisk/core/scheduler/queue/test/MemoryQueueTestsFixture.scala
index d793c5848..8142d86ed 100644
---
a/tests/src/test/scala/org/apache/openwhisk/core/scheduler/queue/test/MemoryQueueTestsFixture.scala
+++
b/tests/src/test/scala/org/apache/openwhisk/core/scheduler/queue/test/MemoryQueueTestsFixture.scala
@@ -32,7 +32,7 @@ import
org.apache.openwhisk.common.WhiskInstants.InstantImplicits
import org.apache.openwhisk.core.WhiskConfig
import org.apache.openwhisk.core.ack.ActiveAck
import org.apache.openwhisk.core.connector.{
- AcknowledegmentMessage,
+ AcknowledgementMessage,
ActivationMessage,
Message,
MessageProducer,
@@ -185,7 +185,7 @@ class MemoryQueueTestsFixture
blockingInvoke: Boolean,
controllerInstance: ControllerInstanceId,
userId: UUID,
- acknowledegment: AcknowledegmentMessage): Future[Any] =
{
+ acknowledgement: AcknowledgementMessage): Future[Any] =
{
ackedMessageCount += 1
lastAckedActivationResult = activationResult
Future.successful({})
diff --git
a/tests/src/test/scala/org/apache/openwhisk/core/scheduler/queue/test/QueueManagerTests.scala
b/tests/src/test/scala/org/apache/openwhisk/core/scheduler/queue/test/QueueManagerTests.scala
index 5baa97ebc..80ab594ef 100644
---
a/tests/src/test/scala/org/apache/openwhisk/core/scheduler/queue/test/QueueManagerTests.scala
+++
b/tests/src/test/scala/org/apache/openwhisk/core/scheduler/queue/test/QueueManagerTests.scala
@@ -29,7 +29,7 @@ import org.apache.openwhisk.common.{GracefulShutdown,
TransactionId}
import org.apache.openwhisk.core.WarmUp.warmUpAction
import org.apache.openwhisk.core.ack.ActiveAck
import org.apache.openwhisk.core.connector.test.TestConnector
-import org.apache.openwhisk.core.connector.{AcknowledegmentMessage,
ActivationMessage, GetState, StatusData}
+import org.apache.openwhisk.core.connector.{AcknowledgementMessage,
ActivationMessage, GetState, StatusData}
import org.apache.openwhisk.core.database.{ArtifactStore,
DocumentRevisionMismatchException, UserContext}
import org.apache.openwhisk.core.entity.ExecManifest.{ImageName,
RuntimeManifest}
import org.apache.openwhisk.core.entity._
@@ -116,7 +116,7 @@ class QueueManagerTests
blockingInvoke: Boolean,
controllerInstance: ControllerInstanceId,
userId: UUID,
- acknowledegment: AcknowledegmentMessage): Future[Any] =
{
+ acknowledgement: AcknowledgementMessage): Future[Any] =
{
Future.successful({})
}
@@ -816,8 +816,8 @@ class QueueManagerTests
blockingInvoke: Boolean,
controllerInstance: ControllerInstanceId,
userId: UUID,
- acknowledegment: AcknowledegmentMessage): Future[Any]
= {
- Future.successful(probe.ref ! acknowledegment.isSystemError)
+ acknowledgement: AcknowledgementMessage): Future[Any]
= {
+ Future.successful(probe.ref ! acknowledgement.isSystemError)
}
}
@@ -870,7 +870,7 @@ class QueueManagerTests
blockingInvoke: Boolean,
controllerInstance: ControllerInstanceId,
userId: UUID,
- acknowledegment: AcknowledegmentMessage): Future[Any]
= {
+ acknowledgement: AcknowledgementMessage): Future[Any]
= {
Future.successful(probe.ref ! activationResult.activationId)
}
}
@@ -914,7 +914,7 @@ class QueueManagerTests
blockingInvoke: Boolean,
controllerInstance: ControllerInstanceId,
userId: UUID,
- acknowledegment: AcknowledegmentMessage): Future[Any]
= {
+ acknowledgement: AcknowledgementMessage): Future[Any]
= {
Future.successful(probe.ref ! activationResult.activationId)
}
}