style95 commented on a change in pull request #4984: URL: https://github.com/apache/openwhisk/pull/4984#discussion_r494674214
########## File path: core/scheduler/src/main/scala/org/apache/openwhisk/core/scheduler/queue/ElasticSearchDurationChecker.scala ########## @@ -0,0 +1,252 @@ +/* + * 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.{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} + +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) => + client + .execute { + (search(index) query { + boolQuery must { + List( + matchQuery("annotations.binding", s"$binding"), + matchQuery("name", actionMetaData.name), + rangeQuery("@timestamp").gte(fromDate)) + } + } 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}") + } + + case None => + client + .execute { + (search(index) query { + boolQuery must { + List(matchQuery("path.keyword", fqn.toString), rangeQuery("@timestamp").gte(fromDate)) + } + } 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 { Review comment: It is based on the SPI. ########## File path: core/scheduler/src/main/scala/org/apache/openwhisk/core/scheduler/queue/NoopDurationChecker.scala ########## @@ -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 { Review comment: This is just for other DBs such as CouchDB or CosmosDB in case the scheduler is used with other than 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. ########## File path: core/scheduler/src/main/scala/org/apache/openwhisk/core/scheduler/queue/NoopDurationChecker.scala ########## @@ -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 { Review comment: 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. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
