diff --git a/cluster/src/main/scala/org/apache/pekko/cluster/JoinConfigCompatCheckCluster.scala b/cluster/src/main/scala/org/apache/pekko/cluster/JoinConfigCompatCheckCluster.scala index 54dd5d7e10..7cfbe70fbe 100644 --- a/cluster/src/main/scala/org/apache/pekko/cluster/JoinConfigCompatCheckCluster.scala +++ b/cluster/src/main/scala/org/apache/pekko/cluster/JoinConfigCompatCheckCluster.scala @@ -19,7 +19,6 @@ import com.typesafe.config.Config import org.apache.pekko import pekko.annotation.InternalApi -import pekko.cluster.sbr.SplitBrainResolverProvider /** * INTERNAL API @@ -27,9 +26,6 @@ import pekko.cluster.sbr.SplitBrainResolverProvider @InternalApi private[pekko] object JoinConfigCompatCheckCluster { private val DowningProviderPath = "pekko.cluster.downing-provider-class" private val SbrStrategyPath = "pekko.cluster.split-brain-resolver.active-strategy" - - private val AkkaSbrProviderClass = classOf[SplitBrainResolverProvider].getName - private val LightbendSbrProviderClass = "com.lightbend.pekko.sbr.SplitBrainResolverProvider" } /** @@ -45,9 +41,7 @@ final class JoinConfigCompatCheckCluster extends JoinConfigCompatChecker { val toCheckDowningProvider = toCheck.getString(DowningProviderPath) val actualDowningProvider = actualConfig.getString(DowningProviderPath) val downingProviderResult = - if (toCheckDowningProvider == actualDowningProvider || Set(toCheckDowningProvider, actualDowningProvider) == Set( - AkkaSbrProviderClass, - LightbendSbrProviderClass)) + if (toCheckDowningProvider == actualDowningProvider) Valid else JoinConfigCompatChecker.checkEquality(List(DowningProviderPath), toCheck, actualConfig) diff --git a/cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatCheckClusterSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatCheckClusterSpec.scala index 1a32ea611f..04d11afcb1 100644 --- a/cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatCheckClusterSpec.scala +++ b/cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatCheckClusterSpec.scala @@ -83,20 +83,6 @@ class JoinConfigCompatCheckClusterSpec extends PekkoSpec { checkInitJoin(oldConfig, newConfig) should ===(Valid) } - "be valid when updating from Lightbend sbr" in { - val oldConfig = - ConfigFactory - .parseString(""" - pekko.cluster.downing-provider-class = "com.lightbend.pekko.sbr.SplitBrainResolverProvider" - """) - .withFallback(system.settings.config) - val newConfig = - ConfigFactory.parseString(""" - pekko.cluster.downing-provider-class = "org.apache.pekko.cluster.sbr.SplitBrainResolverProvider" - """).withFallback(system.settings.config) - checkInitJoin(oldConfig, newConfig) should ===(Valid) - } - "be invalid when different downing-provider" in { val oldConfig = ConfigFactory.parseString("""