Checks for existing static config when adding config from client

When adding dynamic data structure config from client, a check
for existing conflicting static config has to be made before
broadcasting the config to all members.

Other included fixes:
- an issue with CacheSimpleConfig copies not being
equal to their original which resulted in inability to add
the same cache config twice.
- adds dynamic PNCounterConfig support for client side
- an issue with event journal config being ignored
from client-side dynamic cache configuration.

backport of hazelcast#16170

(cherry picked from commit 4d0caf4)

hazelcast-client/src/test/java/com/hazelcast/client/impl/clientside/ClientDynamicConfigSmokeTest.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved.
+ *
+ * Licensed 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 com.hazelcast.client.impl.clientside;
+
+
+import com.hazelcast.client.test.TestHazelcastFactory;
+import com.hazelcast.config.Config;
+import com.hazelcast.core.HazelcastInstance;
+import com.hazelcast.internal.dynamicconfig.DynamicConfigSmokeTest;
+import com.hazelcast.test.HazelcastParallelClassRunner;
+import com.hazelcast.test.annotation.ParallelTest;
+import com.hazelcast.test.annotation.QuickTest;
+import org.junit.Ignore;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+@RunWith(HazelcastParallelClassRunner.class)
+@Category({QuickTest.class, ParallelTest.class})
+public class ClientDynamicConfigSmokeTest extends DynamicConfigSmokeTest {
+
+    @Override
+    protected HazelcastInstance[] members(int count, Config config) {
+        factory = new TestHazelcastFactory(count);
+        if (config == null) {
+            config = smallInstanceConfig();
+        }
+        HazelcastInstance[] members = new HazelcastInstance[count];
+        for (int i = 0; i < count; i++) {
+            members[i] = factory.newHazelcastInstance(config);
+        }
+        return members;
+    }
+
+    @Override
+    protected HazelcastInstance driver() {
+        return ((TestHazelcastFactory) factory).newHazelcastClient();
+    }
+
+    @Override
+    @Ignore("Only makes sense to be executed on the member side")
+    public void mapConfig_withLiteMemberJoiningLater_isImmediatelyAvailable() {
+        super.mapConfig_withLiteMemberJoiningLater_isImmediatelyAvailable();
+    }
+}

hazelcast/src/main/java/com/hazelcast/client/impl/protocol/DefaultMessageTaskFactoryProvider.java

@@ -40,6 +40,7 @@
 import com.hazelcast.client.impl.protocol.task.dynamicconfig.AddMapConfigMessageTask;
 import com.hazelcast.client.impl.protocol.task.dynamicconfig.AddMerkleTreeConfigMessageTask;
 import com.hazelcast.client.impl.protocol.task.dynamicconfig.AddMultiMapConfigMessageTask;
+import com.hazelcast.client.impl.protocol.task.dynamicconfig.AddPNCounterConfigMessageTask;
 import com.hazelcast.client.impl.protocol.task.dynamicconfig.AddQueueConfigMessageTask;
 import com.hazelcast.client.impl.protocol.task.dynamicconfig.AddReliableTopicConfigMessageTask;
 import com.hazelcast.client.impl.protocol.task.dynamicconfig.AddReplicatedMapConfigMessageTask;
@@ -695,7 +696,7 @@ public MessageTask create(ClientMessage clientMessage, Connection connection) {
         };
         factories[com.hazelcast.client.impl.protocol.codec.SemaphoreIncreasePermitsCodec.RequestParameters.TYPE.id()] = new MessageTaskFactory() {
             public MessageTask create(ClientMessage clientMessage, Connection connection) {
-                return new com.hazelcast.client.impl.protocol.task.semaphore.SemaphoreIncreasePermitsMessageTask(clientMessage,node, connection);
+                return new com.hazelcast.client.impl.protocol.task.semaphore.SemaphoreIncreasePermitsMessageTask(clientMessage, node, connection);
             }
         };
         factories[com.hazelcast.client.impl.protocol.codec.SemaphoreTryAcquireCodec.RequestParameters.TYPE.id()] = new MessageTaskFactory() {
@@ -2155,6 +2156,11 @@ public MessageTask create(ClientMessage clientMessage, Connection connection) {
                 return new AddFlakeIdGeneratorConfigMessageTask(clientMessage, node, connection);
             }
         };
+        factories[com.hazelcast.client.impl.protocol.codec.DynamicConfigAddPNCounterConfigCodec.RequestParameters.TYPE.id()] = new MessageTaskFactory() {
+            public MessageTask create(ClientMessage clientMessage, Connection connection) {
+                return new AddPNCounterConfigMessageTask(clientMessage, node, connection);
+            }
+        };
 //endregion
 // region ----------- REGISTRATION FOR flake id generator
         factories[com.hazelcast.client.impl.protocol.codec.FlakeIdGeneratorNewIdBatchCodec.RequestParameters.TYPE.id()] = new MessageTaskFactory() {
@@ -2187,8 +2193,6 @@ public MessageTask create(ClientMessage clientMessage, Connection connection) {
 //endregion
 
 
-
-
         factories[com.hazelcast.client.impl.protocol.codec.CPGroupCreateCPGroupCodec.RequestParameters.TYPE.id()] = new MessageTaskFactory() {
             @Override
             public MessageTask create(ClientMessage clientMessage, Connection connection) {

hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/AbstractAddConfigMessageTask.java

@@ -70,8 +70,12 @@ public Object[] getParameters() {
     public final void processMessage() {
         IdentifiedDataSerializable config = getConfig();
         ClusterWideConfigurationService service = getService(ClusterWideConfigurationService.SERVICE_NAME);
-        ICompletableFuture<Object> future = service.broadcastConfigAsync(config);
-        future.andThen(this);
+        if (checkStaticConfigDoesNotExist(config)) {
+            ICompletableFuture<Object> future = service.broadcastConfigAsync(config);
+            future.andThen(this);
+        } else {
+            sendResponse(null);
+        }
     }
 
     @Override
@@ -106,4 +110,6 @@ protected List<? extends ListenerConfig> adaptListenerConfigs(List<ListenerConfi
     }
 
     protected abstract IdentifiedDataSerializable getConfig();
+
+    protected abstract boolean checkStaticConfigDoesNotExist(IdentifiedDataSerializable config);
 }

hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/AddCacheConfigMessageTask.java

@@ -24,6 +24,7 @@
 import com.hazelcast.config.InMemoryFormat;
 import com.hazelcast.instance.Node;
 import com.hazelcast.nio.Connection;
+import com.hazelcast.internal.dynamicconfig.DynamicConfigurationAwareConfig;
 import com.hazelcast.nio.serialization.IdentifiedDataSerializable;
 
 import java.util.ArrayList;
@@ -91,4 +92,12 @@ protected IdentifiedDataSerializable getConfig() {
     public String getMethodName() {
         return "addCacheConfig";
     }
+
+    @Override
+    protected boolean checkStaticConfigDoesNotExist(IdentifiedDataSerializable config) {
+        DynamicConfigurationAwareConfig nodeConfig = (DynamicConfigurationAwareConfig) nodeEngine.getConfig();
+        CacheSimpleConfig cacheConfig = (CacheSimpleConfig) config;
+        return nodeConfig.checkStaticConfigDoesNotExist(nodeConfig.getStaticConfig().getCacheConfigs(),
+                cacheConfig.getName(), cacheConfig);
+    }
 }

hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/AddCardinalityEstimatorConfigMessageTask.java

@@ -21,6 +21,7 @@
 import com.hazelcast.config.CardinalityEstimatorConfig;
 import com.hazelcast.config.MergePolicyConfig;
 import com.hazelcast.instance.Node;
+import com.hazelcast.internal.dynamicconfig.DynamicConfigurationAwareConfig;
 import com.hazelcast.nio.Connection;
 import com.hazelcast.nio.serialization.IdentifiedDataSerializable;
 
@@ -58,4 +59,12 @@ protected IdentifiedDataSerializable getConfig() {
     public String getMethodName() {
         return "addCardinalityEstimatorConfig";
     }
+
+    @Override
+    protected boolean checkStaticConfigDoesNotExist(IdentifiedDataSerializable config) {
+        DynamicConfigurationAwareConfig nodeConfig = (DynamicConfigurationAwareConfig) nodeEngine.getConfig();
+        CardinalityEstimatorConfig cardinalityEstimatorConfig = (CardinalityEstimatorConfig) config;
+        return nodeConfig.checkStaticConfigDoesNotExist(nodeConfig.getStaticConfig().getCardinalityEstimatorConfigs(),
+                cardinalityEstimatorConfig.getName(), cardinalityEstimatorConfig);
+    }
 }

hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/AddDurableExecutorConfigMessageTask.java

@@ -20,6 +20,7 @@
 import com.hazelcast.client.impl.protocol.codec.DynamicConfigAddDurableExecutorConfigCodec;
 import com.hazelcast.config.DurableExecutorConfig;
 import com.hazelcast.instance.Node;
+import com.hazelcast.internal.dynamicconfig.DynamicConfigurationAwareConfig;
 import com.hazelcast.nio.Connection;
 import com.hazelcast.nio.serialization.IdentifiedDataSerializable;
 
@@ -51,4 +52,12 @@ protected IdentifiedDataSerializable getConfig() {
     public String getMethodName() {
         return "addDurableExecutorConfig";
     }
+
+    @Override
+    protected boolean checkStaticConfigDoesNotExist(IdentifiedDataSerializable config) {
+        DynamicConfigurationAwareConfig nodeConfig = (DynamicConfigurationAwareConfig) nodeEngine.getConfig();
+        DurableExecutorConfig durableExecutorConfig = (DurableExecutorConfig) config;
+        return nodeConfig.checkStaticConfigDoesNotExist(nodeConfig.getStaticConfig().getDurableExecutorConfigs(),
+                durableExecutorConfig.getName(), durableExecutorConfig);
+    }
 }

hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/AddEventJournalConfigMessageTask.java

@@ -20,6 +20,7 @@
 import com.hazelcast.client.impl.protocol.codec.DynamicConfigAddEventJournalConfigCodec;
 import com.hazelcast.config.EventJournalConfig;
 import com.hazelcast.instance.Node;
+import com.hazelcast.internal.dynamicconfig.DynamicConfigurationAwareConfig;
 import com.hazelcast.nio.Connection;
 import com.hazelcast.nio.serialization.IdentifiedDataSerializable;
 import com.hazelcast.util.StringUtil;
@@ -59,6 +60,18 @@ protected IdentifiedDataSerializable getConfig() {
         return config;
     }
 
+    @Override
+    protected boolean checkStaticConfigDoesNotExist(IdentifiedDataSerializable config) {
+        DynamicConfigurationAwareConfig nodeConfig = (DynamicConfigurationAwareConfig) nodeEngine.getConfig();
+        EventJournalConfig eventJournalConfig = (EventJournalConfig) config;
+        String name = eventJournalConfig.getMapName();
+        if (name == null) {
+            name = eventJournalConfig.getCacheName();
+        }
+        return nodeConfig.checkStaticConfigDoesNotExist(nodeConfig.getStaticConfig().getCacheEventJournalConfigs(),
+                name, eventJournalConfig);
+    }
+
     @Override
     public String getMethodName() {
         return "addEventJournalConfig";

hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/AddExecutorConfigMessageTask.java

@@ -20,6 +20,7 @@
 import com.hazelcast.client.impl.protocol.codec.DynamicConfigAddExecutorConfigCodec;
 import com.hazelcast.config.ExecutorConfig;
 import com.hazelcast.instance.Node;
+import com.hazelcast.internal.dynamicconfig.DynamicConfigurationAwareConfig;
 import com.hazelcast.nio.Connection;
 import com.hazelcast.nio.serialization.IdentifiedDataSerializable;
 
@@ -52,4 +53,12 @@ protected IdentifiedDataSerializable getConfig() {
     public String getMethodName() {
         return "addExecutorConfig";
     }
+
+    @Override
+    protected boolean checkStaticConfigDoesNotExist(IdentifiedDataSerializable config) {
+        DynamicConfigurationAwareConfig nodeConfig = (DynamicConfigurationAwareConfig) nodeEngine.getConfig();
+        ExecutorConfig executorConfig = (ExecutorConfig) config;
+        return nodeConfig.checkStaticConfigDoesNotExist(nodeConfig.getStaticConfig().getExecutorConfigs(),
+                executorConfig.getName(), executorConfig);
+    }
 }

hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/AddFlakeIdGeneratorConfigMessageTask.java

@@ -20,6 +20,7 @@
 import com.hazelcast.client.impl.protocol.codec.DynamicConfigAddFlakeIdGeneratorConfigCodec;
 import com.hazelcast.config.FlakeIdGeneratorConfig;
 import com.hazelcast.instance.Node;
+import com.hazelcast.internal.dynamicconfig.DynamicConfigurationAwareConfig;
 import com.hazelcast.nio.Connection;
 import com.hazelcast.nio.serialization.IdentifiedDataSerializable;
 
@@ -55,4 +56,12 @@ protected IdentifiedDataSerializable getConfig() {
     public String getMethodName() {
         return "addFlakeIdGeneratorConfig";
     }
+
+    @Override
+    protected boolean checkStaticConfigDoesNotExist(IdentifiedDataSerializable config) {
+        DynamicConfigurationAwareConfig nodeConfig = (DynamicConfigurationAwareConfig) nodeEngine.getConfig();
+        FlakeIdGeneratorConfig flakeIdGeneratorConfig = (FlakeIdGeneratorConfig) config;
+        return nodeConfig.checkStaticConfigDoesNotExist(nodeConfig.getStaticConfig().getFlakeIdGeneratorConfigs(),
+                flakeIdGeneratorConfig.getName(), flakeIdGeneratorConfig);
+    }
 }

hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/AddListConfigMessageTask.java

@@ -22,6 +22,7 @@
 import com.hazelcast.config.ListConfig;
 import com.hazelcast.config.MergePolicyConfig;
 import com.hazelcast.instance.Node;
+import com.hazelcast.internal.dynamicconfig.DynamicConfigurationAwareConfig;
 import com.hazelcast.nio.Connection;
 import com.hazelcast.nio.serialization.IdentifiedDataSerializable;
 
@@ -66,4 +67,12 @@ protected IdentifiedDataSerializable getConfig() {
     public String getMethodName() {
         return "addListConfig";
     }
+
+    @Override
+    protected boolean checkStaticConfigDoesNotExist(IdentifiedDataSerializable config) {
+        DynamicConfigurationAwareConfig nodeConfig = (DynamicConfigurationAwareConfig) nodeEngine.getConfig();
+        ListConfig listConfig = (ListConfig) config;
+        return nodeConfig.checkStaticConfigDoesNotExist(nodeConfig.getStaticConfig().getListConfigs(),
+                listConfig.getName(), listConfig);
+    }
 }

hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/AddLockConfigMessageTask.java

@@ -20,6 +20,7 @@
 import com.hazelcast.client.impl.protocol.codec.DynamicConfigAddLockConfigCodec;
 import com.hazelcast.config.LockConfig;
 import com.hazelcast.instance.Node;
+import com.hazelcast.internal.dynamicconfig.DynamicConfigurationAwareConfig;
 import com.hazelcast.nio.Connection;
 import com.hazelcast.nio.serialization.IdentifiedDataSerializable;
 
@@ -47,6 +48,14 @@ protected IdentifiedDataSerializable getConfig() {
         return config;
     }
 
+    @Override
+    protected boolean checkStaticConfigDoesNotExist(IdentifiedDataSerializable config) {
+        DynamicConfigurationAwareConfig nodeConfig = (DynamicConfigurationAwareConfig) nodeEngine.getConfig();
+        LockConfig lockConfig = (LockConfig) config;
+        return nodeConfig.checkStaticConfigDoesNotExist(nodeConfig.getStaticConfig().getLockConfigs(),
+                lockConfig.getName(), lockConfig);
+    }
+
     @Override
     public String getMethodName() {
         return "addLockConfig";

hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/AddMapConfigMessageTask.java

@@ -31,6 +31,7 @@
 import com.hazelcast.config.QueryCacheConfig;
 import com.hazelcast.core.PartitioningStrategy;
 import com.hazelcast.instance.Node;
+import com.hazelcast.internal.dynamicconfig.DynamicConfigurationAwareConfig;
 import com.hazelcast.map.eviction.MapEvictionPolicy;
 import com.hazelcast.nio.Connection;
 import com.hazelcast.nio.serialization.IdentifiedDataSerializable;
@@ -128,4 +129,13 @@ private PartitioningStrategyConfig getPartitioningStrategyConfig() {
     public String getMethodName() {
         return "addMapConfig";
     }
+
+    @Override
+    protected boolean checkStaticConfigDoesNotExist(IdentifiedDataSerializable config) {
+        DynamicConfigurationAwareConfig nodeConfig = (DynamicConfigurationAwareConfig) nodeEngine.getConfig();
+        MapConfig mapConfig = (MapConfig) config;
+        return nodeConfig.checkStaticConfigDoesNotExist(
+                nodeConfig.getStaticConfig().getMapConfigs(),
+                mapConfig.getName(), mapConfig);
+    }
 }

hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/AddMerkleTreeConfigMessageTask.java

@@ -20,6 +20,7 @@
 import com.hazelcast.client.impl.protocol.codec.DynamicConfigAddMerkleTreeConfigCodec;
 import com.hazelcast.config.MerkleTreeConfig;
 import com.hazelcast.instance.Node;
+import com.hazelcast.internal.dynamicconfig.DynamicConfigurationAwareConfig;
 import com.hazelcast.nio.Connection;
 import com.hazelcast.nio.serialization.IdentifiedDataSerializable;
 import com.hazelcast.util.Preconditions;
@@ -53,6 +54,14 @@ protected IdentifiedDataSerializable getConfig() {
                 .setDepth(parameters.depth);
     }
 
+    @Override
+    protected boolean checkStaticConfigDoesNotExist(IdentifiedDataSerializable config) {
+        DynamicConfigurationAwareConfig nodeConfig = (DynamicConfigurationAwareConfig) nodeEngine.getConfig();
+        MerkleTreeConfig merkleTreeConfig = (MerkleTreeConfig) config;
+        return nodeConfig.checkStaticConfigDoesNotExist(nodeConfig.getStaticConfig().getMapMerkleTreeConfigs(),
+                merkleTreeConfig.getMapName(), merkleTreeConfig);
+    }
+
     @Override
     public String getMethodName() {
         return "addMerkleTreeConfig";

hazelcast/src/main/java/com/hazelcast/client/impl/protocol/task/dynamicconfig/AddMultiMapConfigMessageTask.java

@@ -22,6 +22,7 @@
 import com.hazelcast.config.MergePolicyConfig;
 import com.hazelcast.config.MultiMapConfig;
 import com.hazelcast.instance.Node;
+import com.hazelcast.internal.dynamicconfig.DynamicConfigurationAwareConfig;
 import com.hazelcast.nio.Connection;
 import com.hazelcast.nio.serialization.IdentifiedDataSerializable;
 
@@ -67,4 +68,12 @@ protected IdentifiedDataSerializable getConfig() {
     public String getMethodName() {
         return "addMultiMapConfig";
     }
+
+    @Override
+    protected boolean checkStaticConfigDoesNotExist(IdentifiedDataSerializable config) {
+        DynamicConfigurationAwareConfig nodeConfig = (DynamicConfigurationAwareConfig) nodeEngine.getConfig();
+        MultiMapConfig multiMapConfig = (MultiMapConfig) config;
+        return nodeConfig.checkStaticConfigDoesNotExist(nodeConfig.getStaticConfig().getMultiMapConfigs(),
+                multiMapConfig.getName(), multiMapConfig);
+    }
 }