From cc9bc49b75b5bed0e906cbf68d3c17ce84958a4b Mon Sep 17 00:00:00 2001 From: John Bampton Date: Thu, 11 Mar 2021 10:41:56 +1000 Subject: [PATCH] chore: fix spelling (#5077) --- ansible/roles/elasticsearch/tasks/deploy.yml | 2 +- .../org/apache/openwhisk/common/Logging.scala | 2 +- .../MultipleReadersSingleWriterCache.scala | 2 +- .../openwhisk/core/entity/DocInfo.scala | 2 +- .../openwhisk/core/entity/WhiskAction.scala | 4 +-- .../openwhisk/core/entity/WhiskPackage.scala | 2 +- .../loadBalancer/InvokerSupervision.scala | 2 +- .../ShardingContainerPoolBalancer.scala | 2 +- .../core/containerpool/ContainerProxy.scala | 2 +- .../docker/DockerCliLogStore.scala | 4 +-- .../standalone/StandaloneDockerSupport.scala | 2 +- docs/actions-new.md | 2 +- docs/single_entrypoint_proxy_contract.md | 2 +- tests/dat/actions/README.md | 2 +- tests/dat/actions/sleep.js | 2 +- .../actionContainers/ActionContainer.scala | 2 +- .../apache/openwhisk/common/ConfigTests.scala | 2 +- .../openwhisk/common/SchedulerTests.scala | 2 +- .../controller/test/ConductorsApiTests.scala | 2 +- .../controller/test/WebActionsApiTests.scala | 34 +++++++++---------- ...tWithFileStorageActivationStoreTests.scala | 2 +- .../AzureBlobAttachmentStoreCDNTests.scala | 2 +- .../s3/S3AttachmentStoreCloudFrontTests.scala | 2 +- .../core/database/test/ReplicatorTests.scala | 2 +- .../test/ParameterEncryptionTests.scala | 2 +- .../ShardingContainerPoolBalancerTests.scala | 2 +- .../core/database/LimitsCommand.scala | 2 +- tools/owperf/README.md | 2 +- 28 files changed, 46 insertions(+), 46 deletions(-) diff --git a/ansible/roles/elasticsearch/tasks/deploy.yml b/ansible/roles/elasticsearch/tasks/deploy.yml index 3728377f474..01940814341 100644 --- a/ansible/roles/elasticsearch/tasks/deploy.yml +++ b/ansible/roles/elasticsearch/tasks/deploy.yml @@ -37,7 +37,7 @@ mode: 0755 become: "{{ db.elasticsearch.dir.become }}" -# create volume direcotry if it's a directory path(not a named volume) +# create volume directory if it's a directory path(not a named volume) - name: ensure elasticserach volume directory is created with permissions file: path: "{{ volume_name }}" diff --git a/common/scala/src/main/scala/org/apache/openwhisk/common/Logging.scala b/common/scala/src/main/scala/org/apache/openwhisk/common/Logging.scala index a87d578893b..9efc9771fa6 100644 --- a/common/scala/src/main/scala/org/apache/openwhisk/common/Logging.scala +++ b/common/scala/src/main/scala/org/apache/openwhisk/common/Logging.scala @@ -107,7 +107,7 @@ class AkkaLogging(loggingAdapter: LoggingAdapter) extends Logging { } /** - * Implementaion of Logging, that uses the output stream. + * Implementation of Logging, that uses the output stream. */ class PrintStreamLogging(outputStream: PrintStream = Console.out) extends Logging { override def emit(loglevel: LogLevel, id: TransactionId, from: AnyRef, message: => String) = { diff --git a/common/scala/src/main/scala/org/apache/openwhisk/core/database/MultipleReadersSingleWriterCache.scala b/common/scala/src/main/scala/org/apache/openwhisk/core/database/MultipleReadersSingleWriterCache.scala index 5856659b545..b8720ee1268 100644 --- a/common/scala/src/main/scala/org/apache/openwhisk/core/database/MultipleReadersSingleWriterCache.scala +++ b/common/scala/src/main/scala/org/apache/openwhisk/core/database/MultipleReadersSingleWriterCache.scala @@ -378,7 +378,7 @@ trait MultipleReadersSingleWriterCache[W, Winfo] { case Failure(t) => // oops, the datastore read failed. invalidate the cache entry // note: that this might be a perfectly legitimate failure, - // e.g. a lookup for a non-existant key; we need to pass the particular t through + // e.g. a lookup for a non-existent key; we need to pass the particular t through invalidateEntry(key, entry) promise.failure(t) } diff --git a/common/scala/src/main/scala/org/apache/openwhisk/core/entity/DocInfo.scala b/common/scala/src/main/scala/org/apache/openwhisk/core/entity/DocInfo.scala index ed067fc0110..f8849d16de0 100644 --- a/common/scala/src/main/scala/org/apache/openwhisk/core/entity/DocInfo.scala +++ b/common/scala/src/main/scala/org/apache/openwhisk/core/entity/DocInfo.scala @@ -94,7 +94,7 @@ protected[core] case class DocInfo protected[entity] (id: DocId, rev: DocRevisio * * @param id the document id * @param rev the document revision, optional; this is an opaque value determined by the datastore - * @param error the error, that occured on trying to put this document into CouchDB + * @param error the error, that occurred on trying to put this document into CouchDB * @param reason the error message that correspands to the error */ case class BulkEntityResult(id: String, rev: Option[DocRevision], error: Option[String], reason: Option[String]) { diff --git a/common/scala/src/main/scala/org/apache/openwhisk/core/entity/WhiskAction.scala b/common/scala/src/main/scala/org/apache/openwhisk/core/entity/WhiskAction.scala index 4370a1781e3..a51e5527889 100644 --- a/common/scala/src/main/scala/org/apache/openwhisk/core/entity/WhiskAction.scala +++ b/common/scala/src/main/scala/org/apache/openwhisk/core/entity/WhiskAction.scala @@ -367,7 +367,7 @@ object WhiskAction extends DocumentFactory[WhiskAction] with WhiskEntityQueries[ "annotations", "updated") - // overriden to store attached code + // overridden to store attached code override def put[A >: WhiskAction](db: ArtifactStore[A], doc: WhiskAction, old: Option[WhiskAction])( implicit transid: TransactionId, notifier: Option[CacheChangeNotification]): Future[DocInfo] = { @@ -420,7 +420,7 @@ object WhiskAction extends DocumentFactory[WhiskAction] with WhiskEntityQueries[ } } - // overriden to retrieve attached code + // overridden to retrieve attached code override def get[A >: WhiskAction]( db: ArtifactStore[A], doc: DocId, diff --git a/common/scala/src/main/scala/org/apache/openwhisk/core/entity/WhiskPackage.scala b/common/scala/src/main/scala/org/apache/openwhisk/core/entity/WhiskPackage.scala index 3acac54c080..b9027f89466 100644 --- a/common/scala/src/main/scala/org/apache/openwhisk/core/entity/WhiskPackage.scala +++ b/common/scala/src/main/scala/org/apache/openwhisk/core/entity/WhiskPackage.scala @@ -203,7 +203,7 @@ object WhiskPackage lazy val publicPackagesView: View = WhiskQueries.entitiesView(collection = s"$collectionName-public") - // overriden to store encrypted parameters. + // overridden to store encrypted parameters. override def put[A >: WhiskPackage](db: ArtifactStore[A], doc: WhiskPackage, old: Option[WhiskPackage])( implicit transid: TransactionId, notifier: Option[CacheChangeNotification]): Future[DocInfo] = { diff --git a/core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/InvokerSupervision.scala b/core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/InvokerSupervision.scala index d0a648bdfc5..8422491b84a 100644 --- a/core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/InvokerSupervision.scala +++ b/core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/InvokerSupervision.scala @@ -416,7 +416,7 @@ class InvokerActor(invokerInstance: InvokerInstanceId, controllerInstance: Contr case _ => // At steady state, the state of the buffer superceded and we hold the current state - // until enough events have occured to transition to a new state. + // until enough events have occurred to transition to a new state. stay } } diff --git a/core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/ShardingContainerPoolBalancer.scala b/core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/ShardingContainerPoolBalancer.scala index f06cb04279b..28c1a835c81 100644 --- a/core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/ShardingContainerPoolBalancer.scala +++ b/core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/ShardingContainerPoolBalancer.scala @@ -114,7 +114,7 @@ import scala.concurrent.duration.FiniteDuration * no ping is seen for a defined amount of time, the invoker is considered "Offline". * * Moreover, results from all activations are inspected. If more than 3 out of the last 10 activations contained system - * errors, the invoker is considered "Unhealthy". If an invoker is unhealty, no user workload is sent to it, but + * errors, the invoker is considered "Unhealthy". If an invoker is unhealthy, no user workload is sent to it, but * test-actions are sent by the loadbalancer to check if system errors are still happening. If the * system-error-threshold-count in the last 10 activations falls below 3, the invoker is considered "Healthy" again. * diff --git a/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/ContainerProxy.scala b/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/ContainerProxy.scala index d84947b5f5b..9af4f84aa34 100644 --- a/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/ContainerProxy.scala +++ b/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/ContainerProxy.scala @@ -555,7 +555,7 @@ class ContainerProxy(factory: (TransactionId, // container is reclaimed by the pool or it has become too old case Event(StateTimeout | Remove, data: WarmedData) => - rescheduleJob = true // to supress sending message to the pool and not double count + rescheduleJob = true // to suppress sending message to the pool and not double count destroyContainer(data, true) } diff --git a/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/docker/DockerCliLogStore.scala b/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/docker/DockerCliLogStore.scala index 89f6a8f2bca..d53ebfb1e04 100644 --- a/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/docker/DockerCliLogStore.scala +++ b/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/docker/DockerCliLogStore.scala @@ -64,9 +64,9 @@ class ExtendedDockerClient(dockerHost: Option[String] = None)(executionContext: private val waitForLogs: FiniteDuration = 2.seconds private val logTimeSpanMargin = 1.second - def collectLogs(id: ContainerId, since: Instant, untill: Instant)(implicit transid: TransactionId): Future[String] = { + def collectLogs(id: ContainerId, since: Instant, until: Instant)(implicit transid: TransactionId): Future[String] = { //Add a slight buffer to account for delay writes of logs - val end = untill.plusSeconds(logTimeSpanMargin.toSeconds) + val end = until.plusSeconds(logTimeSpanMargin.toSeconds) runCmd( Seq( "logs", diff --git a/core/standalone/src/main/scala/org/apache/openwhisk/standalone/StandaloneDockerSupport.scala b/core/standalone/src/main/scala/org/apache/openwhisk/standalone/StandaloneDockerSupport.scala index c6d37153670..0913f348f98 100644 --- a/core/standalone/src/main/scala/org/apache/openwhisk/standalone/StandaloneDockerSupport.scala +++ b/core/standalone/src/main/scala/org/apache/openwhisk/standalone/StandaloneDockerSupport.scala @@ -107,7 +107,7 @@ object StandaloneDockerSupport { /** * Returns the hostname to access the playground. - * It defaults to localhost but it can be overriden + * It defaults to localhost but it can be overridden * and it is useful when the standalone is run in a container. */ def getExternalHostName(): String = { diff --git a/docs/actions-new.md b/docs/actions-new.md index 2aea2e1461d..937ecaea535 100644 --- a/docs/actions-new.md +++ b/docs/actions-new.md @@ -283,7 +283,7 @@ The OpenWhisk platform will perform a generic integration test as part of its ba system tests. This integration test will require a [test function](#the-test-action) to be available so that the test harness can create, invoke, and delete the action. -### Supporting Additonal Execution Environments +### Supporting Additional Execution Environments There are now several runtimes that support execution environments in addition to OpenWhisk. Currently only an interface for single entrypoint execution environments has been defined, but more could be defined in the future. diff --git a/docs/single_entrypoint_proxy_contract.md b/docs/single_entrypoint_proxy_contract.md index d364dbbed34..4f2ed33b284 100644 --- a/docs/single_entrypoint_proxy_contract.md +++ b/docs/single_entrypoint_proxy_contract.md @@ -81,7 +81,7 @@ In the following example: } ``` -The underlying function would recieve a parameters map with the keys `name` and `location` with the values `Alan Turing` and `England` respectively. +The underlying function would receive a parameters map with the keys `name` and `location` with the values `Alan Turing` and `England` respectively. ## Init/Run diff --git a/tests/dat/actions/README.md b/tests/dat/actions/README.md index d5a960f10ba..1ac83768156 100644 --- a/tests/dat/actions/README.md +++ b/tests/dat/actions/README.md @@ -23,7 +23,7 @@ Some test artifacts should be build ahead of actually running the tests. These test artifacts compile source code into binaries, generate JAR files, install modules and package functions into zip files. -A `build.sh` script is availble as a convenience and will run ahead of tests +A `build.sh` script is available as a convenience and will run ahead of tests when using `gradle`. However this script will not work on Windows as it currently assumes Bash is available. diff --git a/tests/dat/actions/sleep.js b/tests/dat/actions/sleep.js index 8c9bc179107..ae18d4cb294 100644 --- a/tests/dat/actions/sleep.js +++ b/tests/dat/actions/sleep.js @@ -38,7 +38,7 @@ function main(parm) { } if((parm.sleepTimeInMs < 0) || !Number.isFinite(parm.sleepTimeInMs)) { - const result = { error: "Parameter 'sleepTimeInMs' must be finite, postive integer value." } + const result = { error: "Parameter 'sleepTimeInMs' must be finite, positive integer value." } console.error(result.error) return result } diff --git a/tests/src/test/scala/actionContainers/ActionContainer.scala b/tests/src/test/scala/actionContainers/ActionContainer.scala index dfba3c60ca8..28c6937d340 100644 --- a/tests/src/test/scala/actionContainers/ActionContainer.scala +++ b/tests/src/test/scala/actionContainers/ActionContainer.scala @@ -151,7 +151,7 @@ object ActionContainer { throw new RuntimeException(s""" |Unable to connect to docker host using $dockerCmdString as command string. |The docker host is determined using the Java property 'docker.host' or - |the envirnoment variable 'DOCKER_HOST'. Please verify that one or the + |the environment variable 'DOCKER_HOST'. Please verify that one or the |other is set for your build/test process.""".stripMargin) case Success((v, _, _)) if v == 0 => // Do nothing case Failure(t) => throw t diff --git a/tests/src/test/scala/org/apache/openwhisk/common/ConfigTests.scala b/tests/src/test/scala/org/apache/openwhisk/common/ConfigTests.scala index ea0485065e7..6f13575a33e 100644 --- a/tests/src/test/scala/org/apache/openwhisk/common/ConfigTests.scala +++ b/tests/src/test/scala/org/apache/openwhisk/common/ConfigTests.scala @@ -32,7 +32,7 @@ class ConfigTests extends FlatSpec with Matchers with StreamLogging { assert(config.isValid && config("a") == "A") } - it should "get value from environemnt" in { + it should "get value from environment" in { val config = new Config(Map("a" -> null, "b" -> ""))(Map("A" -> "xyz")) assert(config.isValid && config("a") == "xyz" && config("b") == "") } diff --git a/tests/src/test/scala/org/apache/openwhisk/common/SchedulerTests.scala b/tests/src/test/scala/org/apache/openwhisk/common/SchedulerTests.scala index 08518fd1287..549733a5a10 100644 --- a/tests/src/test/scala/org/apache/openwhisk/common/SchedulerTests.scala +++ b/tests/src/test/scala/org/apache/openwhisk/common/SchedulerTests.scala @@ -81,7 +81,7 @@ class SchedulerTests extends FlatSpec with Matchers with WskActorSystem with Str callCount shouldBe countAfterKill } - it should "throw an expection when passed a negative duration" in { + it should "throw an exception when passed a negative duration" in { an[IllegalArgumentException] should be thrownBy Scheduler.scheduleWaitAtLeast(-100 milliseconds) { () => Future.successful(true) } diff --git a/tests/src/test/scala/org/apache/openwhisk/core/controller/test/ConductorsApiTests.scala b/tests/src/test/scala/org/apache/openwhisk/core/controller/test/ConductorsApiTests.scala index 115a8e23657..1645b887e16 100644 --- a/tests/src/test/scala/org/apache/openwhisk/core/controller/test/ConductorsApiTests.scala +++ b/tests/src/test/scala/org/apache/openwhisk/core/controller/test/ConductorsApiTests.scala @@ -368,7 +368,7 @@ class ConductorsApiTests extends ControllerTestCommon with WhiskActionsApi { } Future(Right(respond(action, msg, result))) case _ => - Future.failed(new IllegalArgumentException("Unkown action invoked in conductor test")) + Future.failed(new IllegalArgumentException("Unknown action invoked in conductor test")) } } } getOrElse Future.failed(new IllegalArgumentException("No invocation parameters in conductor test")) diff --git a/tests/src/test/scala/org/apache/openwhisk/core/controller/test/WebActionsApiTests.scala b/tests/src/test/scala/org/apache/openwhisk/core/controller/test/WebActionsApiTests.scala index dd7ce68dceb..a1b67ec996c 100644 --- a/tests/src/test/scala/org/apache/openwhisk/core/controller/test/WebActionsApiTests.scala +++ b/tests/src/test/scala/org/apache/openwhisk/core/controller/test/WebActionsApiTests.scala @@ -772,18 +772,18 @@ trait WebActionsApiBaseTests extends ControllerTestCommon with BeforeAndAfterEac put(entityStore, reference) put(entityStore, action) - val contentX = JsObject("x" -> "overriden".toJson) - val contentZ = JsObject("z" -> "overriden".toJson) + val contentX = JsObject("x" -> "overridden".toJson) + val contentZ = JsObject("z" -> "overridden".toJson) allowedMethodsWithEntity.foreach { m => invocationsAllowed += 1 - m(s"$testRoutePath/$systemId/${reference.name}/export_c.json?x=overriden") ~> Route.seal(routes(creds)) ~> check { + m(s"$testRoutePath/$systemId/${reference.name}/export_c.json?x=overridden") ~> Route.seal(routes(creds)) ~> check { status should be(BadRequest) responseAs[ErrorResponse].error shouldBe Messages.parametersNotAllowed } - m(s"$testRoutePath/$systemId/${reference.name}/export_c.json?y=overriden") ~> Route.seal(routes(creds)) ~> check { + m(s"$testRoutePath/$systemId/${reference.name}/export_c.json?y=overridden") ~> Route.seal(routes(creds)) ~> check { status should be(BadRequest) responseAs[ErrorResponse].error shouldBe Messages.parametersNotAllowed } @@ -793,13 +793,13 @@ trait WebActionsApiBaseTests extends ControllerTestCommon with BeforeAndAfterEac responseAs[ErrorResponse].error shouldBe Messages.parametersNotAllowed } - m(s"$testRoutePath/$systemId/${reference.name}/export_c.json?y=overriden", contentZ) ~> Route.seal( + m(s"$testRoutePath/$systemId/${reference.name}/export_c.json?y=overridden", contentZ) ~> Route.seal( routes(creds)) ~> check { status should be(BadRequest) responseAs[ErrorResponse].error shouldBe Messages.parametersNotAllowed } - m(s"$testRoutePath/$systemId/${reference.name}/export_c.json?empty=overriden") ~> Route.seal(routes(creds)) ~> check { + m(s"$testRoutePath/$systemId/${reference.name}/export_c.json?empty=overridden") ~> Route.seal(routes(creds)) ~> check { status should be(OK) val response = responseAs[JsObject] response shouldBe JsObject( @@ -807,7 +807,7 @@ trait WebActionsApiBaseTests extends ControllerTestCommon with BeforeAndAfterEac "action" -> "export_c".toJson, "content" -> metaPayload( m.method.name.toLowerCase, - Map("empty" -> "overriden").toJson.asJsObject, + Map("empty" -> "overridden").toJson.asJsObject, creds, pkgName = "proxy")) } @@ -1554,18 +1554,18 @@ trait WebActionsApiBaseTests extends ControllerTestCommon with BeforeAndAfterEac it should s"reject request that tries to override final parameters (auth? ${creds.isDefined})" in { implicit val tid = transid() - val contentX = JsObject("x" -> "overriden".toJson) - val contentZ = JsObject("z" -> "overriden".toJson) + val contentX = JsObject("x" -> "overridden".toJson) + val contentZ = JsObject("z" -> "overridden".toJson) allowedMethodsWithEntity.foreach { m => invocationsAllowed += 1 - m(s"$testRoutePath/$systemId/proxy/export_c.json?x=overriden") ~> Route.seal(routes(creds)) ~> check { + m(s"$testRoutePath/$systemId/proxy/export_c.json?x=overridden") ~> Route.seal(routes(creds)) ~> check { status should be(BadRequest) responseAs[ErrorResponse].error shouldBe Messages.parametersNotAllowed } - m(s"$testRoutePath/$systemId/proxy/export_c.json?y=overriden") ~> Route.seal(routes(creds)) ~> check { + m(s"$testRoutePath/$systemId/proxy/export_c.json?y=overridden") ~> Route.seal(routes(creds)) ~> check { status should be(BadRequest) responseAs[ErrorResponse].error shouldBe Messages.parametersNotAllowed } @@ -1575,12 +1575,12 @@ trait WebActionsApiBaseTests extends ControllerTestCommon with BeforeAndAfterEac responseAs[ErrorResponse].error shouldBe Messages.parametersNotAllowed } - m(s"$testRoutePath/$systemId/proxy/export_c.json?y=overriden", contentZ) ~> Route.seal(routes(creds)) ~> check { + m(s"$testRoutePath/$systemId/proxy/export_c.json?y=overridden", contentZ) ~> Route.seal(routes(creds)) ~> check { status should be(BadRequest) responseAs[ErrorResponse].error shouldBe Messages.parametersNotAllowed } - m(s"$testRoutePath/$systemId/proxy/export_c.json?empty=overriden") ~> Route.seal(routes(creds)) ~> check { + m(s"$testRoutePath/$systemId/proxy/export_c.json?empty=overridden") ~> Route.seal(routes(creds)) ~> check { status should be(OK) val response = responseAs[JsObject] response shouldBe JsObject( @@ -1588,7 +1588,7 @@ trait WebActionsApiBaseTests extends ControllerTestCommon with BeforeAndAfterEac "action" -> "export_c".toJson, "content" -> metaPayload( m.method.name.toLowerCase, - Map("empty" -> "overriden").toJson.asJsObject, + Map("empty" -> "overridden").toJson.asJsObject, creds, pkgName = "proxy")) } @@ -1783,7 +1783,7 @@ trait WebActionsApiBaseTests extends ControllerTestCommon with BeforeAndAfterEac implicit val tid = transid() invocationsAllowed = 2 - val queryString = "x=overriden&key2=value2" + val queryString = "x=overridden&key2=value2" Post(s"$testRoutePath/$systemId/proxy/raw_export_c.json?$queryString") ~> Route.seal(routes(creds)) ~> check { status should be(OK) val response = responseAs[JsObject] @@ -1799,7 +1799,7 @@ trait WebActionsApiBaseTests extends ControllerTestCommon with BeforeAndAfterEac Post( s"$testRoutePath/$systemId/proxy/raw_export_c.json", - JsObject("x" -> "overriden".toJson, "key2" -> "value2".toJson)) ~> Route.seal(routes(creds)) ~> check { + JsObject("x" -> "overridden".toJson, "key2" -> "value2".toJson)) ~> Route.seal(routes(creds)) ~> check { status should be(OK) val response = responseAs[JsObject] response shouldBe JsObject( @@ -1808,7 +1808,7 @@ trait WebActionsApiBaseTests extends ControllerTestCommon with BeforeAndAfterEac "content" -> metaPayload( Post.method.name.toLowerCase, Map(webApiDirectives.query -> "".toJson, webApiDirectives.body -> Base64.getEncoder.encodeToString { - JsObject("x" -> JsString("overriden"), "key2" -> JsString("value2")).compactPrint.getBytes + JsObject("x" -> JsString("overridden"), "key2" -> JsString("value2")).compactPrint.getBytes }.toJson).toJson.asJsObject, creds, pkgName = "proxy", diff --git a/tests/src/test/scala/org/apache/openwhisk/core/database/ArtifactWithFileStorageActivationStoreTests.scala b/tests/src/test/scala/org/apache/openwhisk/core/database/ArtifactWithFileStorageActivationStoreTests.scala index ea74492012a..fb848c873b9 100644 --- a/tests/src/test/scala/org/apache/openwhisk/core/database/ArtifactWithFileStorageActivationStoreTests.scala +++ b/tests/src/test/scala/org/apache/openwhisk/core/database/ArtifactWithFileStorageActivationStoreTests.scala @@ -294,7 +294,7 @@ class ArtifactWithFileStorageActivationStoreTests() // END - example of a simple ArtifactActivationStore implementation that uses activationToFileExtended - // writeResultToFile is defined with the inverted value of includeResult and should be overriden by the test + // writeResultToFile is defined with the inverted value of includeResult and should be overridden by the test val config = ArtifactWithFileStorageActivationStoreConfigExtendedTest("userlogs", "logs", "namespaceId", !includeResult) diff --git a/tests/src/test/scala/org/apache/openwhisk/core/database/azblob/AzureBlobAttachmentStoreCDNTests.scala b/tests/src/test/scala/org/apache/openwhisk/core/database/azblob/AzureBlobAttachmentStoreCDNTests.scala index c3664cab2f3..98d0e2a78b8 100644 --- a/tests/src/test/scala/org/apache/openwhisk/core/database/azblob/AzureBlobAttachmentStoreCDNTests.scala +++ b/tests/src/test/scala/org/apache/openwhisk/core/database/azblob/AzureBlobAttachmentStoreCDNTests.scala @@ -41,7 +41,7 @@ class AzureBlobAttachmentStoreCDNTests extends AzureBlobAttachmentStoreBehaviorB super.withFixture(test) } - //With AzureCDN deletes are not immediate and instead the objects may live in CDN cache untill TTL + //With AzureCDN deletes are not immediate and instead the objects may live in CDN cache until TTL override protected val lazyDeletes = true } diff --git a/tests/src/test/scala/org/apache/openwhisk/core/database/s3/S3AttachmentStoreCloudFrontTests.scala b/tests/src/test/scala/org/apache/openwhisk/core/database/s3/S3AttachmentStoreCloudFrontTests.scala index f2c8b7efaf1..5e14a37df98 100644 --- a/tests/src/test/scala/org/apache/openwhisk/core/database/s3/S3AttachmentStoreCloudFrontTests.scala +++ b/tests/src/test/scala/org/apache/openwhisk/core/database/s3/S3AttachmentStoreCloudFrontTests.scala @@ -42,6 +42,6 @@ class S3AttachmentStoreCloudFrontTests extends S3AttachmentStoreBehaviorBase wit super.withFixture(test) } - //With CloudFront deletes are not immediate and instead the objects may live in CDN cache untill TTL + //With CloudFront deletes are not immediate and instead the objects may live in CDN cache until TTL override protected val lazyDeletes = true } diff --git a/tests/src/test/scala/org/apache/openwhisk/core/database/test/ReplicatorTests.scala b/tests/src/test/scala/org/apache/openwhisk/core/database/test/ReplicatorTests.scala index 37ba7ca2511..13387f55fc2 100644 --- a/tests/src/test/scala/org/apache/openwhisk/core/database/test/ReplicatorTests.scala +++ b/tests/src/test/scala/org/apache/openwhisk/core/database/test/ReplicatorTests.scala @@ -349,7 +349,7 @@ class ReplicatorTests it should "continuously update a database" in { // Create a database to backup - val dbName = testDbPrefix + "database_for_continous_replication" + val dbName = testDbPrefix + "database_for_continuous_replication" val backupDbName = s"continuous_$dbName" // Pre-test cleanup of previously created entities diff --git a/tests/src/test/scala/org/apache/openwhisk/core/entity/test/ParameterEncryptionTests.scala b/tests/src/test/scala/org/apache/openwhisk/core/entity/test/ParameterEncryptionTests.scala index 8fe2a5d51a8..5aeea91693a 100644 --- a/tests/src/test/scala/org/apache/openwhisk/core/entity/test/ParameterEncryptionTests.scala +++ b/tests/src/test/scala/org/apache/openwhisk/core/entity/test/ParameterEncryptionTests.scala @@ -138,7 +138,7 @@ class ParameterEncryptionTests extends FlatSpec with Matchers with BeforeAndAfte locked.lockedParameters() shouldBe Map("one" -> "aes-128", "two" -> "aes-128") } - it should "serialize to json correctly when a locked parameter is overriden" in { + it should "serialize to json correctly when a locked parameter is overridden" in { val locked = parameters.lock(aes128encoder) locked .merge(Some(JsObject("one" -> JsString("override")))) diff --git a/tests/src/test/scala/org/apache/openwhisk/core/loadBalancer/test/ShardingContainerPoolBalancerTests.scala b/tests/src/test/scala/org/apache/openwhisk/core/loadBalancer/test/ShardingContainerPoolBalancerTests.scala index 11fee6d002b..5096ddb4f2d 100644 --- a/tests/src/test/scala/org/apache/openwhisk/core/loadBalancer/test/ShardingContainerPoolBalancerTests.scala +++ b/tests/src/test/scala/org/apache/openwhisk/core/loadBalancer/test/ShardingContainerPoolBalancerTests.scala @@ -127,7 +127,7 @@ class ShardingContainerPoolBalancerTests state.managedStepSizes shouldBe Seq(1) state.blackboxStepSizes shouldBe Seq(1) - // aquire a slot to alter invoker state + // acquire a slot to alter invoker state state.invokerSlots.head.tryAcquire(memoryPerSlot.toMB.toInt) state.invokerSlots.head.availablePermits shouldBe (memory - memoryPerSlot).toMB.toInt diff --git a/tools/admin/src/main/scala/org/apache/openwhisk/core/database/LimitsCommand.scala b/tools/admin/src/main/scala/org/apache/openwhisk/core/database/LimitsCommand.scala index 83973f594bc..488c3bd187c 100644 --- a/tools/admin/src/main/scala/org/apache/openwhisk/core/database/LimitsCommand.scala +++ b/tools/admin/src/main/scala/org/apache/openwhisk/core/database/LimitsCommand.scala @@ -42,7 +42,7 @@ class LimitsCommand extends Subcommand("limits") with WhiskCommand { val namespace = trailArg[String](descr = "the namespace to set limits for") - //name is explicitly mentioned for backward compatability + //name is explicitly mentioned for backward compatibility //otherwise scallop would convert it to - separated names val invocationsPerMinute = opt[Int]( diff --git a/tools/owperf/README.md b/tools/owperf/README.md index d39eb7421b0..ccf79b63614 100644 --- a/tools/owperf/README.md +++ b/tools/owperf/README.md @@ -39,7 +39,7 @@ The general operation of a test is simple: Final results are written to the standard output stream (so can be redirected to a file) as a single highly-detailed CSV record containing all the input settings and the output measurements (see below). There is additional control information that is written to the standard error stream and can be silenced in CLI. The control information also contains the CSV header, so it can be copied into a spreadsheet if needed. -It is possible to invoke the tool in "Master apart" mode, where the master client is invoking a diffrent activity than the workers, and at possibly a different (very likely, much slower) rate. In this mode, latency statsitics are computed based solely on the master's data, since the worker's activity is used only as background to stress the OpenWhisk deployment. So one experiment can have the master client invoke rules and another one can have the master client invoke actions, while in both experiments the worker clients perform the same background activity. +It is possible to invoke the tool in "Master apart" mode, where the master client is invoking a different activity than the workers, and at possibly a different (very likely, much slower) rate. In this mode, latency statsitics are computed based solely on the master's data, since the worker's activity is used only as background to stress the OpenWhisk deployment. So one experiment can have the master client invoke rules and another one can have the master client invoke actions, while in both experiments the worker clients perform the same background activity. The tool is highly customizable via CLI options. All the independent test variables are controlled via CLI. This includes number of workers, invocation pattern, OW client configuration, test action sleep time, etc.