Skip to content

Commit c04a9b4

Browse files
hunhoffehunhoffe
authored andcommitted
Remove cluster creation from ShardingContainerPoolBalancer
1 parent c6284af commit c04a9b4

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/ShardingContainerPoolBalancer.scala

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ import java.util.concurrent.ThreadLocalRandom
2424
import akka.actor.{Actor, ActorSystem, Cancellable, Props}
2525
import akka.cluster.ClusterEvent._
2626
import akka.cluster.{Cluster, Member, MemberStatus}
27-
import akka.management.scaladsl.AkkaManagement
28-
import akka.management.cluster.bootstrap.ClusterBootstrap
2927
import org.apache.openwhisk.common.InvokerState.{Healthy, Offline, Unhealthy, Unresponsive}
3028
import pureconfig._
3129
import pureconfig.generic.auto._
@@ -154,11 +152,7 @@ class ShardingContainerPoolBalancer(
154152
extends CommonLoadBalancer(config, feedFactory, controllerInstance) {
155153

156154
/** Build a cluster of all loadbalancers */
157-
private val cluster: Option[Cluster] = if (loadConfigOrThrow[ClusterConfig](ConfigKeys.cluster).useClusterBootstrap) {
158-
AkkaManagement(actorSystem).start()
159-
ClusterBootstrap(actorSystem).start()
160-
Some(Cluster(actorSystem))
161-
} else if (loadConfigOrThrow[Seq[String]]("akka.cluster.seed-nodes").nonEmpty) {
155+
private val cluster: Option[Cluster] = if (loadConfigOrThrow[ClusterConfig](ConfigKeys.cluster).useClusterBootstrap || loadConfigOrThrow[Seq[String]]("akka.cluster.seed-nodes").nonEmpty) {
162156
Some(Cluster(actorSystem))
163157
} else {
164158
None

0 commit comments

Comments
 (0)