mridulm commented on code in PR #2739: URL: https://github.com/apache/celeborn/pull/2739#discussion_r1759627928
########## master/src/main/scala/org/apache/celeborn/service/deploy/master/tags/TagsManager.scala: ########## @@ -0,0 +1,87 @@ +/* + * 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.celeborn.service.deploy.master.tags + +import java.util.concurrent.ConcurrentHashMap + +import scala.collection.JavaConverters.{asScalaIteratorConverter, mapAsScalaConcurrentMapConverter} + +import org.apache.celeborn.common.internal.Logging +import org.apache.celeborn.common.meta.WorkerInfo +import org.apache.celeborn.service.deploy.master.tags.TagsManager.{Tag, TagsStore} + +object TagsManager { + type Tag = String + type WorkerId = String + + type TagsStore = ConcurrentHashMap[Tag, Set[WorkerId]] Review Comment: Since the value of `TagStore` is not exposed outside of `TagsManager` fo both read/write, make this a mutable MT-safe data structure ? like `ConcurrentHashMap.newKeySet()` for some such for ex ? It will avoid perf degradation if mutations keep happening. ```suggestion import java.util.{Set => JSet} type TagsStore = ConcurrentHashMap[Tag, JSet[WorkerId]] ``` ########## master/src/main/scala/org/apache/celeborn/service/deploy/master/tags/TagsManager.scala: ########## @@ -0,0 +1,87 @@ +/* + * 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.celeborn.service.deploy.master.tags + +import java.util.concurrent.ConcurrentHashMap + +import scala.collection.JavaConverters.{asScalaIteratorConverter, mapAsScalaConcurrentMapConverter} + +import org.apache.celeborn.common.internal.Logging +import org.apache.celeborn.common.meta.WorkerInfo +import org.apache.celeborn.service.deploy.master.tags.TagsManager.{Tag, TagsStore} + +object TagsManager { + type Tag = String + type WorkerId = String + + type TagsStore = ConcurrentHashMap[Tag, Set[WorkerId]] +} + +class TagsManager extends Logging { + private val tagStore = new TagsStore() + + def getTaggedWorkers(tag: Tag, workers: List[WorkerInfo]): List[WorkerInfo] = { + if (!tagStore.containsKey(tag)) { + logWarning(s"Tag $tag not found in cluster") + return List.empty + } + + workers.filter(worker => tagStore.get(tag).contains(worker.host)) Review Comment: ```suggestion val workersForTag = tagStore.get(tag) if (null == workersForTag) { logWarning(s"Tag $tag not found in cluster") return List.empty } workers.filter(worker => workersForTag.contains(worker.host)) ``` ########## master/src/main/scala/org/apache/celeborn/service/deploy/master/tags/TagsManager.scala: ########## @@ -0,0 +1,87 @@ +/* + * 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.celeborn.service.deploy.master.tags + +import java.util.concurrent.ConcurrentHashMap + +import scala.collection.JavaConverters.{asScalaIteratorConverter, mapAsScalaConcurrentMapConverter} + +import org.apache.celeborn.common.internal.Logging +import org.apache.celeborn.common.meta.WorkerInfo +import org.apache.celeborn.service.deploy.master.tags.TagsManager.{Tag, TagsStore} + +object TagsManager { + type Tag = String + type WorkerId = String + + type TagsStore = ConcurrentHashMap[Tag, Set[WorkerId]] +} + +class TagsManager extends Logging { + private val tagStore = new TagsStore() + + def getTaggedWorkers(tag: Tag, workers: List[WorkerInfo]): List[WorkerInfo] = { + if (!tagStore.containsKey(tag)) { + logWarning(s"Tag $tag not found in cluster") + return List.empty + } + + workers.filter(worker => tagStore.get(tag).contains(worker.host)) + } + + def addTagToWorker(tag: Tag, worker: WorkerInfo): Unit = { + val workerId = worker.host + val workers = tagStore.get(tag) + + logInfo(s"Adding Tag $tag to worker $workerId") + if (workers == null) { + tagStore.put(tag, Set(workerId)) + } else { + tagStore.put(tag, workers + workerId) + } Review Comment: ```suggestion val workers = tagStore.computeIfAbsent(tag, ConcurrentHashMap.newKeySet[String]()) logInfo(s"Adding Tag $tag to worker $workerId") workers.add(workerId) ``` ########## master/src/main/scala/org/apache/celeborn/service/deploy/master/tags/TagsManager.scala: ########## @@ -0,0 +1,87 @@ +/* + * 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.celeborn.service.deploy.master.tags + +import java.util.concurrent.ConcurrentHashMap + +import scala.collection.JavaConverters.{asScalaIteratorConverter, mapAsScalaConcurrentMapConverter} + +import org.apache.celeborn.common.internal.Logging +import org.apache.celeborn.common.meta.WorkerInfo +import org.apache.celeborn.service.deploy.master.tags.TagsManager.{Tag, TagsStore} + +object TagsManager { + type Tag = String + type WorkerId = String + + type TagsStore = ConcurrentHashMap[Tag, Set[WorkerId]] +} + +class TagsManager extends Logging { + private val tagStore = new TagsStore() + + def getTaggedWorkers(tag: Tag, workers: List[WorkerInfo]): List[WorkerInfo] = { + if (!tagStore.containsKey(tag)) { + logWarning(s"Tag $tag not found in cluster") + return List.empty + } + + workers.filter(worker => tagStore.get(tag).contains(worker.host)) + } + + def addTagToWorker(tag: Tag, worker: WorkerInfo): Unit = { + val workerId = worker.host + val workers = tagStore.get(tag) + + logInfo(s"Adding Tag $tag to worker $workerId") + if (workers == null) { + tagStore.put(tag, Set(workerId)) + } else { + tagStore.put(tag, workers + workerId) + } + } + + def removeTagFromWorker(tag: Tag, worker: WorkerInfo): Unit = { + val workerId = worker.host + val workers = tagStore.get(tag) + + if (workers != null && workers.contains(workerId)) { + logInfo(s"Removing Tag $tag from worker $workerId") + tagStore.put(tag, workers - workerId) + } else { + logWarning(s"Tag $tag not found for worker $workerId") + } + } + + def getTagsForWorker(worker: WorkerInfo): Set[Tag] = { + tagStore.asScala.filter(_._2.contains(worker.host)).keySet.toSet Review Comment: This can be relatively expensive - are we expecting it to be a common operation ? ########## master/src/main/scala/org/apache/celeborn/service/deploy/master/tags/TagsManager.scala: ########## @@ -0,0 +1,87 @@ +/* + * 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.celeborn.service.deploy.master.tags + +import java.util.concurrent.ConcurrentHashMap + +import scala.collection.JavaConverters.{asScalaIteratorConverter, mapAsScalaConcurrentMapConverter} + +import org.apache.celeborn.common.internal.Logging +import org.apache.celeborn.common.meta.WorkerInfo +import org.apache.celeborn.service.deploy.master.tags.TagsManager.{Tag, TagsStore} + +object TagsManager { + type Tag = String + type WorkerId = String + + type TagsStore = ConcurrentHashMap[Tag, Set[WorkerId]] +} + +class TagsManager extends Logging { + private val tagStore = new TagsStore() + + def getTaggedWorkers(tag: Tag, workers: List[WorkerInfo]): List[WorkerInfo] = { + if (!tagStore.containsKey(tag)) { + logWarning(s"Tag $tag not found in cluster") + return List.empty + } + + workers.filter(worker => tagStore.get(tag).contains(worker.host)) + } + + def addTagToWorker(tag: Tag, worker: WorkerInfo): Unit = { + val workerId = worker.host + val workers = tagStore.get(tag) + + logInfo(s"Adding Tag $tag to worker $workerId") + if (workers == null) { + tagStore.put(tag, Set(workerId)) + } else { + tagStore.put(tag, workers + workerId) + } + } + + def removeTagFromWorker(tag: Tag, worker: WorkerInfo): Unit = { + val workerId = worker.host + val workers = tagStore.get(tag) + + if (workers != null && workers.contains(workerId)) { + logInfo(s"Removing Tag $tag from worker $workerId") + tagStore.put(tag, workers - workerId) + } else { + logWarning(s"Tag $tag not found for worker $workerId") + } + } + + def getTagsForWorker(worker: WorkerInfo): Set[Tag] = { + tagStore.asScala.filter(_._2.contains(worker.host)).keySet.toSet + } + + def removeTagFromCluster(tag: Tag): Unit = { + val workers = tagStore.remove(tag) + if (workers != null) { + logInfo(s"Removed Tag $tag from cluster with workers ${workers.mkString(", ")}") + } else { + logWarning(s"Tag $tag not found in cluster and thus can not be removed") + } + } + + def getTagsForCluster: Set[Tag] = { + tagStore.keySet().iterator().asScala.toSet Review Comment: Wouldn't this not be sufficient ? ```suggestion tagStore.keySet().asScala.toSet ``` -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
