style95 commented on code in PR #5443: URL: https://github.com/apache/openwhisk/pull/5443#discussion_r1337852659
########## tests/src/test/scala/org/apache/openwhisk/core/containerpool/test/ContainerPoolConfigTests.scala: ########## @@ -0,0 +1,77 @@ +/* + * 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.containerpool.test + +import org.apache.openwhisk.core.containerpool.ContainerPoolConfig +import org.apache.openwhisk.core.entity.ByteSize +import org.apache.openwhisk.core.entity.size.SizeInt +import org.junit.runner.RunWith +import org.scalatest.{FlatSpec, Matchers} +import org.scalatest.junit.JUnitRunner + +import scala.concurrent.duration.DurationInt + +@RunWith(classOf[JUnitRunner]) +class ContainerPoolConfigTests extends FlatSpec with Matchers { Review Comment: 👍 ########## core/invoker/src/main/resources/application.conf: ########## @@ -71,6 +71,7 @@ whisk { prewarm-promotion: false # if true, action can take prewarm container which has bigger memory memory-sync-interval: 1 second # period to sync memory info to etcd batch-deletion-size: 10 # batch size for removing containers when disable invoker, too big value may cause docker/k8s overload + # user-cpus: 1 optional setting to limit total allocated cpus for all action containers, each container will get a fraction of this proportional to its allocated memory Review Comment: Is this supposed to be the cpu core of an invoker machine? ########## tests/src/test/scala/org/apache/openwhisk/core/containerpool/test/ContainerPoolConfigTests.scala: ########## @@ -0,0 +1,77 @@ +/* + * 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.containerpool.test + +import org.apache.openwhisk.core.containerpool.ContainerPoolConfig +import org.apache.openwhisk.core.entity.ByteSize +import org.apache.openwhisk.core.entity.size.SizeInt +import org.junit.runner.RunWith +import org.scalatest.{FlatSpec, Matchers} +import org.scalatest.junit.JUnitRunner + +import scala.concurrent.duration.DurationInt + +@RunWith(classOf[JUnitRunner]) +class ContainerPoolConfigTests extends FlatSpec with Matchers { Review Comment: 👍 ########## common/scala/src/main/scala/org/apache/openwhisk/core/containerpool/ContainerFactory.scala: ########## @@ -73,6 +75,15 @@ case class ContainerPoolConfig(userMemory: ByteSize, // Grant more CPU to a container if it allocates more memory. def cpuShare(reservedMemory: ByteSize) = max((totalShare / (userMemory.toBytes / reservedMemory.toBytes)).toInt, 2) // The minimum allowed cpu-shares is 2 + + private val minContainerCpus = 0.01 // The minimum cpus allowed by docker is 0.01 + def cpuLimit(reservedMemory: ByteSize): Option[Double] = { + userCpus.map(c => { + val containerCpus = c / (userMemory.toBytes / reservedMemory.toBytes) + val roundedContainerCpus = round(containerCpus * 100).toDouble / 100 // Docker only allows decimal precision of 2 + max(roundedContainerCpus, minContainerCpus) Review Comment: So the expected cpu limit with the default configuration would be 0.125 core for 256MB? -- 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: issues-unsubscr...@openwhisk.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
