Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[New Scheduler] Add duration checker #4984

Merged
merged 9 commits into from
Jan 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ansible/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -421,3 +421,6 @@ metrics:
port: "{{ metrics_kamon_statsd_port | default('8125') }}"

user_events: "{{ user_events_enabled | default(false) | lower }}"

durationChecker:
timeWindow: "{{ duration_checker_time_window | default('1 d') }}"
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,8 @@ object ConfigKeys {
val metrics = "whisk.metrics"
val featureFlags = "whisk.feature-flags"

val durationChecker = s"whisk.duration-checker"

val whiskConfig = "whisk.config"
val sharedPackageExecuteOnly = s"whisk.shared-packages-execute-only"
val swaggerUi = "whisk.swagger-ui"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,27 +57,17 @@ case class ElasticSearchActivationStoreConfig(protocol: String,

class ElasticSearchActivationStore(
httpFlow: Option[Flow[(HttpRequest, Promise[HttpResponse]), (Try[HttpResponse], Promise[HttpResponse]), Any]] = None,
elasticSearchConfig: ElasticSearchActivationStoreConfig =
loadConfigOrThrow[ElasticSearchActivationStoreConfig](ConfigKeys.elasticSearchActivationStore),
elasticSearchConfig: ElasticSearchActivationStoreConfig,
useBatching: Boolean = false)(implicit actorSystem: ActorSystem,
actorMaterializer: ActorMaterializer,
logging: Logging)
extends ActivationStore {

import com.sksamuel.elastic4s.http.ElasticDsl._
import ElasticSearchActivationStore.{generateIndex, httpClientCallback}

private implicit val executionContextExecutor: ExecutionContextExecutor = actorSystem.dispatcher

private val httpClientCallback = new HttpClientConfigCallback {
override def customizeHttpClient(httpClientBuilder: HttpAsyncClientBuilder): HttpAsyncClientBuilder = {
val provider = new BasicCredentialsProvider
provider.setCredentials(
AuthScope.ANY,
new UsernamePasswordCredentials(elasticSearchConfig.username, elasticSearchConfig.password))
httpClientBuilder.setDefaultCredentialsProvider(provider)
}
}

private val client =
ElasticClient(
ElasticProperties(s"${elasticSearchConfig.protocol}://${elasticSearchConfig.hosts}"),
Expand Down Expand Up @@ -407,18 +397,38 @@ class ElasticSearchActivationStore(
activationId.toString.split("/")(0)
}

private def generateIndex(namespace: String): String = {
elasticSearchConfig.indexPattern.dropWhile(_ == '/') format namespace.toLowerCase
}

private def generateRangeQuery(key: String, since: Option[Instant], upto: Option[Instant]): RangeQuery = {
rangeQuery(key)
.gte(since.map(_.toEpochMilli).getOrElse(minStart))
.lte(upto.map(_.toEpochMilli).getOrElse(maxStart))
}
}

object ElasticSearchActivationStore {
val elasticSearchConfig: ElasticSearchActivationStoreConfig =
loadConfigOrThrow[ElasticSearchActivationStoreConfig](ConfigKeys.elasticSearchActivationStore)

val httpClientCallback = new HttpClientConfigCallback {
override def customizeHttpClient(httpClientBuilder: HttpAsyncClientBuilder): HttpAsyncClientBuilder = {
val provider = new BasicCredentialsProvider
provider.setCredentials(
AuthScope.ANY,
new UsernamePasswordCredentials(elasticSearchConfig.username, elasticSearchConfig.password))
httpClientBuilder.setDefaultCredentialsProvider(provider)
}
}

def generateIndex(namespace: String): String = {
elasticSearchConfig.indexPattern.dropWhile(_ == '/') format namespace.toLowerCase
}
}

object ElasticSearchActivationStoreProvider extends ActivationStoreProvider {
import ElasticSearchActivationStore.elasticSearchConfig

override def instance(actorSystem: ActorSystem, actorMaterializer: ActorMaterializer, logging: Logging) =
new ElasticSearchActivationStore(useBatching = true)(actorSystem, actorMaterializer, logging)
new ElasticSearchActivationStore(elasticSearchConfig = elasticSearchConfig, useBatching = true)(
actorSystem,
actorMaterializer,
logging)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,245 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.openwhisk.core.scheduler.queue

import akka.actor.ActorSystem
import com.sksamuel.elastic4s.http.ElasticDsl._
import com.sksamuel.elastic4s.http.{ElasticClient, ElasticProperties, NoOpRequestConfigCallback}
import com.sksamuel.elastic4s.searches.queries.Query
import com.sksamuel.elastic4s.{ElasticDate, ElasticDateMath, Seconds}
import org.apache.openwhisk.common.Logging
import org.apache.openwhisk.core.ConfigKeys
import org.apache.openwhisk.core.entity.WhiskActionMetaData
import org.apache.openwhisk.spi.Spi
import pureconfig.loadConfigOrThrow
import spray.json.{JsArray, JsNumber, JsValue, RootJsonFormat, deserializationError, _}

import scala.concurrent.Future
import scala.concurrent.duration.FiniteDuration
import scala.language.implicitConversions
import scala.util.{Failure, Try}
import pureconfig.generic.auto._

trait DurationChecker {
def checkAverageDuration(invocationNamespace: String, actionMetaData: WhiskActionMetaData)(
callback: DurationCheckResult => DurationCheckResult): Future[DurationCheckResult]
}

case class DurationCheckResult(averageDuration: Option[Double], hitCount: Long, took: Long)

object ElasticSearchDurationChecker {
val FilterAggregationName = "filterAggregation"
val AverageAggregationName = "averageAggregation"

implicit val serde = new ElasticSearchDurationCheckResultFormat()

def getFromDate(timeWindow: FiniteDuration): ElasticDateMath =
ElasticDate.now minus (timeWindow.toSeconds.toInt, Seconds)
}

class ElasticSearchDurationChecker(private val client: ElasticClient, val timeWindow: FiniteDuration)(
implicit val actorSystem: ActorSystem,
implicit val logging: Logging)
extends DurationChecker {
import ElasticSearchDurationChecker._
import org.apache.openwhisk.core.database.elasticsearch.ElasticSearchActivationStore.generateIndex

implicit val ec = actorSystem.getDispatcher

override def checkAverageDuration(invocationNamespace: String, actionMetaData: WhiskActionMetaData)(
callback: DurationCheckResult => DurationCheckResult): Future[DurationCheckResult] = {
val index = generateIndex(invocationNamespace)
val fqn = actionMetaData.fullyQualifiedName(false)
val fromDate = getFromDate(timeWindow)

logging.info(this, s"check average duration for $fqn in $index for last $timeWindow")

actionMetaData.binding match {
case Some(binding) =>
val boolQueryResult = List(
matchQuery("annotations.binding", s"$binding"),
matchQuery("name", actionMetaData.name),
rangeQuery("@timestamp").gte(fromDate))

executeQuery(boolQueryResult, callback, index)

case None =>
val queryResult = List(matchQuery("path.keyword", fqn.toString), rangeQuery("@timestamp").gte(fromDate))

executeQuery(queryResult, callback, index)
}
}

private def executeQuery(boolQueryResult: List[Query],
callback: DurationCheckResult => DurationCheckResult,
index: String) = {
client
.execute {
(search(index) query {
boolQuery must {
boolQueryResult
}
} aggregations
avgAgg(AverageAggregationName, "duration")).size(0)
}
.map { res =>
logging.debug(this, s"ElasticSearch query results: $res")
Try(serde.read(res.body.getOrElse("").parseJson))
}
.flatMap(Future.fromTry)
.map(callback(_))
.andThen {
case Failure(t) =>
logging.error(this, s"failed to check the average duration: ${t}")
}
}
}

object ElasticSearchDurationCheckerProvider extends DurationCheckerProvider {
import org.apache.openwhisk.core.database.elasticsearch.ElasticSearchActivationStore._

override def instance(actorSystem: ActorSystem, log: Logging): ElasticSearchDurationChecker = {
implicit val as: ActorSystem = actorSystem
implicit val logging: Logging = log

val elasticClient =
ElasticClient(
ElasticProperties(s"${elasticSearchConfig.protocol}://${elasticSearchConfig.hosts}"),
NoOpRequestConfigCallback,
httpClientCallback)

new ElasticSearchDurationChecker(elasticClient, durationCheckerConfig.timeWindow)
}
}

trait DurationCheckerProvider extends Spi {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is based on the SPI.


val durationCheckerConfig: DurationCheckerConfig =
loadConfigOrThrow[DurationCheckerConfig](ConfigKeys.durationChecker)

def instance(actorSystem: ActorSystem, logging: Logging): DurationChecker
}

class ElasticSearchDurationCheckResultFormat extends RootJsonFormat[DurationCheckResult] {
import ElasticSearchDurationChecker._
import spray.json.DefaultJsonProtocol._

/**
* Expected sample data
{
"_shards": {
"failed": 0,
"skipped": 0,
"successful": 5,
"total": 5
},
"aggregations": {
"agg": {
"value": 14
}
},
"hits": {
"hits": [],
"max_score": 0,
"total": 3
},
"timed_out": false,
"took": 0
}
*/
/**
* Expected sample data
{
"_shards": {
"failed": 0,
"skipped": 0,
"successful": 5,
"total": 5
},
"aggregations": {
"pathAggregation": {
"avg_duration": {
"value": 13
},
"doc_count": 3
}
},
"hits": {
"hits": [],
"max_score": 0,
"total": 6
},
"timed_out": false,
"took": 0
}
*/
implicit def read(json: JsValue) = {
val jsObject = json.asJsObject

jsObject.getFields("aggregations", "took", "hits") match {
case Seq(aggregations, took, hits) =>
val hitCount = hits.asJsObject.getFields("total").headOption
val filterAggregations = aggregations.asJsObject.getFields(FilterAggregationName)
val averageAggregations = aggregations.asJsObject.getFields(AverageAggregationName)

(filterAggregations, averageAggregations, hitCount) match {
case (filterAggregations, _, Some(count)) if filterAggregations.nonEmpty =>
val averageDuration =
filterAggregations.headOption.flatMap(
_.asJsObject
.getFields(AverageAggregationName)
.headOption
.flatMap(_.asJsObject.getFields("value").headOption))

averageDuration match {
case Some(JsNull) =>
DurationCheckResult(None, count.convertTo[Long], took.convertTo[Long])

case Some(duration) =>
DurationCheckResult(Some(duration.convertTo[Double]), count.convertTo[Long], took.convertTo[Long])

case _ => deserializationError("Cannot deserialize ProductItem: invalid input. Raw input: ")
}

case (_, averageAggregations, Some(count)) if averageAggregations.nonEmpty =>
val averageDuration = averageAggregations.headOption.flatMap(_.asJsObject.getFields("value").headOption)

averageDuration match {
case Some(JsNull) =>
DurationCheckResult(None, count.convertTo[Long], took.convertTo[Long])

case Some(duration) =>
DurationCheckResult(Some(duration.convertTo[Double]), count.convertTo[Long], took.convertTo[Long])

case t => deserializationError(s"Cannot deserialize DurationCheckResult: invalid input. Raw input: $t")
}

case t => deserializationError(s"Cannot deserialize DurationCheckResult: invalid input. Raw input: $t")
}

case other => deserializationError(s"Cannot deserialize DurationCheckResult: invalid input. Raw input: $other")
}

}

// This method would not be used.
override def write(obj: DurationCheckResult): JsValue = {
JsArray(JsNumber(obj.averageDuration.get), JsNumber(obj.hitCount), JsNumber(obj.took))
}
}

case class DurationCheckerConfig(timeWindow: FiniteDuration)
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.openwhisk.core.scheduler.queue

import akka.actor.ActorSystem
import org.apache.openwhisk.common.Logging
import org.apache.openwhisk.core.entity.WhiskActionMetaData

import scala.concurrent.Future

object NoopDurationCheckerProvider extends DurationCheckerProvider {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so this means you operate the schedule without using the average activation duration for an action heuristic. How important is using the heuristic for the performance of the scheduler?

Copy link
Member Author

@style95 style95 Sep 25, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just for other DBs such as CouchDB or CosmosDB in case the scheduler is used with other than ES.
(Even if it is highly recommended to use with ES.)

Regarding the average duration, it is important to improve the accuracy of calculation but the queue can still work without it. When an action is newly created, there is no activation accordingly no average duration.
In such a case, it assumes one container can handle one activation for the given time.
So even if one container can handle multiple activations for a given period, it assumes a container can handle only one activation, so schedulers would tend to overprovision containers.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the case of couchdb or cosmosdb, there is no average activation duration calculation since it uses this correct?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes.
If required, anyone can create it as it is based on SPI.

And one thing I forgot to tell you is, after this duration checker is landed, we introduced one more optimization.
Initially, the average duration was always calculated based on this module, but now(in our downstream), this is only used when a queue is newly created. After then, the queue uses the duration passed from containers.
As per POEM2, each container autonomously pulls an activation by sending a fetch-request. So when they send the fetch-request, we added one more field lastDuration. So the queue can keep the recent N duration in the circular queue and calculate the average duration without any external API call.

But when a new queue is created or an action is newly created, there is no data in the circular queue and the duration checker is used in such cases.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah okay cool so if I understand what you just said correctly once the invoker is running, we still will get to use the average activation duration heuristic since we track it in memory. The elasticsearch spi is just for startup. That's good to know the optimization you described sounds more important we'll still get the benefits of tracking activation duration

override def instance(actorSystem: ActorSystem, log: Logging): NoopDurationChecker = {
implicit val as: ActorSystem = actorSystem
implicit val logging: Logging = log
new NoopDurationChecker()
}
}

object NoopDurationChecker {
implicit val serde = new ElasticSearchDurationCheckResultFormat()
}

class NoopDurationChecker extends DurationChecker {
import scala.concurrent.ExecutionContext.Implicits.global

override def checkAverageDuration(invocationNamespace: String, actionMetaData: WhiskActionMetaData)(
callback: DurationCheckResult => DurationCheckResult): Future[DurationCheckResult] = {
Future {
DurationCheckResult(Option.apply(0), 0, 0)
}
}
}
Loading