You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by fa...@apache.org on 2023/02/15 14:54:21 UTC
[incubator-pekko] branch main updated: remove support for legacy Lightbend Split Brain Resolver (#190)
This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko.git
The following commit(s) were added to refs/heads/main by this push:
new 3c196e98f3 remove support for legacy Lightbend Split Brain Resolver (#190)
3c196e98f3 is described below
commit 3c196e98f38d25f3b71ce23849470529674bad3a
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Wed Feb 15 15:54:14 2023 +0100
remove support for legacy Lightbend Split Brain Resolver (#190)
---
.../pekko/cluster/JoinConfigCompatCheckCluster.scala | 8 +-------
.../pekko/cluster/JoinConfigCompatCheckClusterSpec.scala | 14 --------------
2 files changed, 1 insertion(+), 21 deletions(-)
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("""
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org