-
Notifications
You must be signed in to change notification settings - Fork 1.2k
[New Scheduler] Add container counter #5072
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
Merged
style95
merged 3 commits into
apache:master
from
jiangpengcheng:add_namespace_container_counter
Mar 11, 2021
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
121 changes: 121 additions & 0 deletions
121
...scheduler/src/main/scala/org/apache/openwhisk/core/scheduler/queue/ContainerCounter.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,121 @@ | ||
/* | ||
* 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 java.util.concurrent.atomic.AtomicInteger | ||
|
||
import akka.actor.{Actor, ActorRef, ActorSystem, Props} | ||
import org.apache.openwhisk.common.Logging | ||
import org.apache.openwhisk.core.etcd.EtcdClient | ||
import org.apache.openwhisk.core.etcd.EtcdKV.ContainerKeys | ||
import org.apache.openwhisk.core.service.{DeleteEvent, PutEvent, UnwatchEndpoint, WatchEndpoint, WatchEndpointOperation} | ||
|
||
import scala.collection.concurrent.TrieMap | ||
import scala.concurrent.{ExecutionContext, Future} | ||
|
||
class ContainerCounter(invocationNamespace: String, etcdClient: EtcdClient, watcherService: ActorRef)( | ||
implicit val actorSystem: ActorSystem, | ||
ec: ExecutionContext, | ||
logging: Logging) { | ||
private[queue] var existingContainerNumByNamespace: Int = 0 | ||
private[queue] var inProgressContainerNumByNamespace: Int = 0 | ||
private[queue] val references = new AtomicInteger(0) | ||
private val watcherName = s"container-counter-$invocationNamespace" | ||
|
||
private val inProgressContainerPrefixKeyByNamespace = | ||
ContainerKeys.inProgressContainerPrefixByNamespace(invocationNamespace) | ||
private val existingContainerPrefixKeyByNamespace = | ||
ContainerKeys.existingContainersPrefixByNamespace(invocationNamespace) | ||
|
||
private val watchedKeys = Seq(inProgressContainerPrefixKeyByNamespace, existingContainerPrefixKeyByNamespace) | ||
|
||
private val watcher = | ||
actorSystem.actorOf(Props(new Actor { | ||
private var countingKeys = Set.empty[String] | ||
private var waitingForCountKeys = Set.empty[String] | ||
|
||
override def receive: Receive = { | ||
case operation: WatchEndpointOperation if operation.isPrefix => | ||
if (countingKeys | ||
.contains(operation.watchKey)) | ||
waitingForCountKeys += operation.watchKey | ||
else { | ||
countingKeys += operation.watchKey | ||
refreshContainerCount(operation.watchKey) | ||
} | ||
|
||
case ReadyToGetCount(key) => | ||
if (waitingForCountKeys.contains(key)) { | ||
waitingForCountKeys -= key | ||
refreshContainerCount(key) | ||
} else | ||
countingKeys -= key | ||
} | ||
})) | ||
|
||
private def refreshContainerCount(key: String): Future[Unit] = { | ||
etcdClient | ||
.getCount(key) | ||
.map { count => | ||
key match { | ||
case `inProgressContainerPrefixKeyByNamespace` => inProgressContainerNumByNamespace = count.toInt | ||
case `existingContainerPrefixKeyByNamespace` => existingContainerNumByNamespace = count.toInt | ||
} | ||
watcher ! ReadyToGetCount(key) | ||
} | ||
.recover { | ||
case t: Throwable => | ||
logging.error( | ||
this, | ||
s"failed to get the number of existing containers for ${invocationNamespace} due to ${t}.") | ||
watcher ! ReadyToGetCount(key) | ||
} | ||
} | ||
|
||
def increaseReference(): ContainerCounter = { | ||
if (references.incrementAndGet() == 1) { | ||
watchedKeys.foreach { key => | ||
watcherService.tell(WatchEndpoint(key, "", true, watcherName, Set(PutEvent, DeleteEvent)), watcher) | ||
} | ||
|
||
} | ||
this | ||
} | ||
|
||
def close(): Unit = { | ||
if (references.decrementAndGet() == 0) { | ||
watchedKeys.foreach { key => | ||
watcherService ! UnwatchEndpoint(key, true, watcherName) | ||
} | ||
NamespaceContainerCount.instances.remove(invocationNamespace) | ||
} | ||
} | ||
} | ||
|
||
object NamespaceContainerCount { | ||
private[queue] val instances = TrieMap[String, ContainerCounter]() | ||
def apply(namespace: String, etcdClient: EtcdClient, watcherService: ActorRef)(implicit actorSystem: ActorSystem, | ||
ec: ExecutionContext, | ||
logging: Logging): ContainerCounter = { | ||
instances | ||
.getOrElseUpdate(namespace, new ContainerCounter(namespace, etcdClient, watcherService)) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. the Counter are shared among queues which under same namespace, to reduce the query burden against etcd |
||
.increaseReference() | ||
} | ||
} | ||
|
||
case class ReadyToGetCount(key: String) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
to avoid updating
existingContainerNumByNamespace/inProgressContainerNumByNamespace
in multi threads, it will only query and updateexistingContainerNumByNamespace/inProgressContainerNumByNamespace
at one time, during querying and updating, incoming watch events will wait in aset