fixed cluster roles

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
eclipse-ditto · Aug 2, 2022 · 1396eba · 1396eba
1 parent 96ba615
commit 1396eba
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 9 deletions.
diff --git a/connectivity/service/src/main/resources/connectivity.conf b/connectivity/service/src/main/resources/connectivity.conf
@@ -974,7 +974,8 @@ akka {
     }
 
     roles = [
-      "connectivity"
+      "connectivity",
+      "blocked-namespaces-aware" # must be blocked-namespaces-aware if 'ditto.policies-enforcer-cache.enabled'=true
     ]
   }
   coordinated-shutdown {

diff --git a/internal/utils/config/src/main/resources/ditto-cluster.conf b/internal/utils/config/src/main/resources/ditto-cluster.conf
@@ -5,7 +5,6 @@ ditto.cluster {
 
   cluster-status-roles-blocklist = [
     "dc-default",
-    "ddata-aware",
     "blocked-namespaces-aware",
     "thing-event-aware",
     "live-signal-aware",

diff --git a/...aces/src/test/java/org/eclipse/ditto/internal/utils/namespaces/BlockedNamespacesTest.java b/...aces/src/test/java/org/eclipse/ditto/internal/utils/namespaces/BlockedNamespacesTest.java
@@ -64,7 +64,7 @@ public void startWithoutRole() throws Exception {
 
     @Test
     public void startWithMatchingRole() throws Exception {
-        testCRUD(BlockedNamespaces.create(DistributedData.createConfig(actorSystem, "replicator", "ddata-aware"),
+        testCRUD(BlockedNamespaces.create(DistributedData.createConfig(actorSystem, "replicator", "blocked-namespaces-aware"),
                 actorSystem), actorSystem);
     }
 

diff --git a/internal/utils/namespaces/src/test/resources/test.conf b/internal/utils/namespaces/src/test/resources/test.conf
@@ -1,6 +1,6 @@
 akka {
   actor.provider = "cluster"
-  cluster.roles = ["ddata-aware", "blocked-namespaces-aware"]
+  cluster.roles = ["blocked-namespaces-aware"]
 
   remote.artery {
     enabled = on

diff --git a/policies/service/src/main/resources/policies.conf b/policies/service/src/main/resources/policies.conf
@@ -170,7 +170,6 @@ akka {
     roles = [
       "policies",
       "policy-announcement-aware",
-      "ddata-aware",
       "blocked-namespaces-aware"
     ]
   }

diff --git a/things/service/src/main/resources/things.conf b/things/service/src/main/resources/things.conf
@@ -179,7 +179,6 @@ akka {
       "thing-event-aware",
       "live-signal-aware",
       "acks-aware",
-      "ddata-aware",
       "blocked-namespaces-aware"
     ]
   }

diff --git a/things/service/src/test/resources/test.conf b/things/service/src/test/resources/test.conf
@@ -90,7 +90,6 @@ akka {
       "thing-event-aware",
       "live-signal-aware",
       "acks-aware",
-      "ddata-aware",
       "blocked-namespaces-aware"
     ]
   }

diff --git a/thingsearch/service/src/test/resources/actors-test.conf b/thingsearch/service/src/test/resources/actors-test.conf
@@ -185,7 +185,6 @@ akka {
 
     roles = [
       "search",
-      "ddata-aware",
       "blocked-namespaces-aware",
       "thing-event-aware"
     ]

diff --git a/thingsearch/service/src/test/resources/test.conf b/thingsearch/service/src/test/resources/test.conf
@@ -103,7 +103,6 @@ akka {
 
     roles = [
       "search",
-      "ddata-aware",
       "blocked-namespaces-aware"
     ]
   }