X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fconfig%2FConfigurationImpl.java;h=1ede88c3cb91c74bbfac078937e1b99868859aed;hb=dcc776a5e749d495a66e8753e123a1ddbd15d9c6;hp=b7bcc59f2ffd9e6c4f0a3eff0a8dc0afbf69e164;hpb=60dbe8adeda3af724255231af9400341b17953b9;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/ConfigurationImpl.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/ConfigurationImpl.java index b7bcc59f2f..1ede88c3cb 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/ConfigurationImpl.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/ConfigurationImpl.java @@ -5,10 +5,10 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.controller.cluster.datastore.config; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import java.util.ArrayList; @@ -19,6 +19,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import org.opendaylight.controller.cluster.access.concepts.MemberName; import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategy; import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategyFactory; @@ -35,26 +36,31 @@ public class ConfigurationImpl implements Configuration { } public ConfigurationImpl(final ModuleShardConfigProvider provider) { - this.moduleConfigMap = ImmutableMap.copyOf(provider.retrieveModuleConfigs(this)); + ImmutableMap.Builder mapBuilder = ImmutableMap.builder(); + for (Map.Entry e: provider.retrieveModuleConfigs(this).entrySet()) { + mapBuilder.put(e.getKey(), e.getValue().build()); + } + + this.moduleConfigMap = mapBuilder.build(); this.allShardNames = createAllShardNames(moduleConfigMap.values()); this.namespaceToModuleName = createNamespaceToModuleName(moduleConfigMap.values()); } - private static Set createAllShardNames(Iterable moduleConfigs) { + private static Set createAllShardNames(final Iterable moduleConfigs) { final ImmutableSet.Builder builder = ImmutableSet.builder(); - for(ModuleConfig moduleConfig : moduleConfigs) { + for (ModuleConfig moduleConfig : moduleConfigs) { builder.addAll(moduleConfig.getShardNames()); } return builder.build(); } - private static Map createNamespaceToModuleName(Iterable moduleConfigs) { + private static Map createNamespaceToModuleName(final Iterable moduleConfigs) { final ImmutableMap.Builder builder = ImmutableMap.builder(); - for(ModuleConfig moduleConfig : moduleConfigs) { - if(moduleConfig.getNameSpace() != null) { - builder.put(moduleConfig.getNameSpace(), moduleConfig.getName()); + for (ModuleConfig moduleConfig : moduleConfigs) { + if (moduleConfig.getNamespace() != null) { + builder.put(moduleConfig.getNamespace(), moduleConfig.getName()); } } @@ -62,13 +68,13 @@ public class ConfigurationImpl implements Configuration { } @Override - public Collection getMemberShardNames(final String memberName){ - Preconditions.checkNotNull(memberName, "memberName should not be null"); + public Collection getMemberShardNames(final MemberName memberName) { + requireNonNull(memberName, "memberName should not be null"); List shards = new ArrayList<>(); - for(ModuleConfig moduleConfig: moduleConfigMap.values()) { - for(ShardConfig shardConfig: moduleConfig.getShardConfigs()) { - if(shardConfig.getReplicas().contains(memberName)) { + for (ModuleConfig moduleConfig: moduleConfigMap.values()) { + for (ShardConfig shardConfig: moduleConfig.getShardConfigs()) { + if (shardConfig.getReplicas().contains(memberName)) { shards.add(shardConfig.getName()); } } @@ -79,36 +85,38 @@ public class ConfigurationImpl implements Configuration { @Override public String getModuleNameFromNameSpace(final String nameSpace) { - Preconditions.checkNotNull(nameSpace, "nameSpace should not be null"); - - return namespaceToModuleName.get(nameSpace); + return namespaceToModuleName.get(requireNonNull(nameSpace, "nameSpace should not be null")); } @Override - public ShardStrategy getStrategyForModule(String moduleName) { - Preconditions.checkNotNull(moduleName, "moduleName should not be null"); - - ModuleConfig moduleConfig = moduleConfigMap.get(moduleName); - return moduleConfig != null ? moduleConfig.getShardStrategy(): null; + public ShardStrategy getStrategyForModule(final String moduleName) { + ModuleConfig moduleConfig = getModuleConfig(moduleName); + return moduleConfig != null ? moduleConfig.getShardStrategy() : null; } @Override public String getShardNameForModule(final String moduleName) { - Preconditions.checkNotNull(moduleName, "moduleName should not be null"); + ModuleConfig moduleConfig = getModuleConfig(moduleName); + if (moduleConfig != null) { + Collection shardConfigs = moduleConfig.getShardConfigs(); + if (!shardConfigs.isEmpty()) { + return shardConfigs.iterator().next().getName(); + } + } + return null; + } - ModuleConfig moduleConfig = moduleConfigMap.get(moduleName); - Collection shardConfigs = moduleConfig != null ? moduleConfig.getShardConfigs() : - Collections.emptySet(); - return !shardConfigs.isEmpty() ? shardConfigs.iterator().next().getName(): null; + private ModuleConfig getModuleConfig(final String moduleName) { + return moduleConfigMap.get(requireNonNull(moduleName, "moduleName should not be null")); } @Override - public Collection getMembersFromShardName(final String shardName) { - Preconditions.checkNotNull(shardName, "shardName should not be null"); + public Collection getMembersFromShardName(final String shardName) { + checkNotNullShardName(shardName); - for(ModuleConfig moduleConfig: moduleConfigMap.values()) { + for (ModuleConfig moduleConfig: moduleConfigMap.values()) { ShardConfig shardConfig = moduleConfig.getShardConfig(shardName); - if(shardConfig != null) { + if (shardConfig != null) { return shardConfig.getReplicas(); } } @@ -116,15 +124,19 @@ public class ConfigurationImpl implements Configuration { return Collections.emptyList(); } + private static void checkNotNullShardName(final String shardName) { + requireNonNull(shardName, "shardName should not be null"); + } + @Override public Set getAllShardNames() { return allShardNames; } @Override - public Collection getUniqueMemberNamesForAllShards() { - Set allNames = new HashSet<>(); - for(String shardName: getAllShardNames()) { + public Collection getUniqueMemberNamesForAllShards() { + Set allNames = new HashSet<>(); + for (String shardName: getAllShardNames()) { allNames.addAll(getMembersFromShardName(shardName)); } @@ -132,73 +144,66 @@ public class ConfigurationImpl implements Configuration { } @Override - public synchronized void addModuleShardConfiguration(ModuleShardConfiguration config) { - Preconditions.checkNotNull(config, "ModuleShardConfiguration should not be null"); - - ModuleConfig moduleConfig = new ModuleConfig(config.getModuleName()); - moduleConfig.setNameSpace(config.getNamespace().toASCIIString()); - moduleConfig.setShardStrategy(createShardStrategy(config.getModuleName(), config.getShardStrategyName())); + public synchronized void addModuleShardConfiguration(final ModuleShardConfiguration config) { + requireNonNull(config, "ModuleShardConfiguration should not be null"); - moduleConfig.addShardConfig(config.getShardName(), ImmutableSet.copyOf(config.getShardMemberNames())); + ModuleConfig moduleConfig = ModuleConfig.builder(config.getModuleName()) + .nameSpace(config.getNamespace().toString()) + .shardStrategy(createShardStrategy(config.getModuleName(), config.getShardStrategyName())) + .shardConfig(config.getShardName(), config.getShardMemberNames()).build(); - moduleConfigMap = ImmutableMap.builder().putAll(moduleConfigMap). - put(config.getModuleName(), moduleConfig).build(); + updateModuleConfigMap(moduleConfig); - namespaceToModuleName = ImmutableMap.builder().putAll(namespaceToModuleName). - put(moduleConfig.getNameSpace(), moduleConfig.getName()).build(); + namespaceToModuleName = ImmutableMap.builder().putAll(namespaceToModuleName) + .put(moduleConfig.getNamespace(), moduleConfig.getName()).build(); allShardNames = ImmutableSet.builder().addAll(allShardNames).add(config.getShardName()).build(); } - private ShardStrategy createShardStrategy(String moduleName, String shardStrategyName) { + private ShardStrategy createShardStrategy(final String moduleName, final String shardStrategyName) { return ShardStrategyFactory.newShardStrategyInstance(moduleName, shardStrategyName, this); } @Override - public boolean isShardConfigured(String shardName) { - Preconditions.checkNotNull(shardName, "shardName should not be null"); + public boolean isShardConfigured(final String shardName) { + checkNotNullShardName(shardName); return allShardNames.contains(shardName); } @Override - public void addMemberReplicaForShard (String shardName, String newMemberName) { - Preconditions.checkNotNull(shardName, "shardName should not be null"); - Preconditions.checkNotNull(newMemberName, "MemberName should not be null"); + public void addMemberReplicaForShard(final String shardName, final MemberName newMemberName) { + checkNotNullShardName(shardName); + requireNonNull(newMemberName, "MemberName should not be null"); - for(ModuleConfig moduleConfig: moduleConfigMap.values()) { + for (ModuleConfig moduleConfig: moduleConfigMap.values()) { ShardConfig shardConfig = moduleConfig.getShardConfig(shardName); - if(shardConfig != null) { - ModuleConfig newModuleConfig = new ModuleConfig(moduleConfig); - Set replica = new HashSet<>(shardConfig.getReplicas()); - replica.add(newMemberName); - newModuleConfig.addShardConfig(shardName, ImmutableSet.copyOf(replica)); - updateModuleConfigMap(newModuleConfig); + if (shardConfig != null) { + Set replicas = new HashSet<>(shardConfig.getReplicas()); + replicas.add(newMemberName); + updateModuleConfigMap(ModuleConfig.builder(moduleConfig).shardConfig(shardName, replicas).build()); return; } } } @Override - public void removeMemberReplicaForShard (String shardName, String newMemberName) { - Preconditions.checkNotNull(shardName, "shardName should not be null"); - Preconditions.checkNotNull(newMemberName, "MemberName should not be null"); + public void removeMemberReplicaForShard(final String shardName, final MemberName newMemberName) { + checkNotNullShardName(shardName); + requireNonNull(newMemberName, "MemberName should not be null"); - for(ModuleConfig moduleConfig: moduleConfigMap.values()) { + for (ModuleConfig moduleConfig: moduleConfigMap.values()) { ShardConfig shardConfig = moduleConfig.getShardConfig(shardName); - if(shardConfig != null) { - ModuleConfig newModuleConfig = new ModuleConfig(moduleConfig); - Set replica = new HashSet<>(shardConfig.getReplicas()); - replica.remove(newMemberName); - newModuleConfig.addShardConfig(shardName, ImmutableSet.copyOf(replica)); - updateModuleConfigMap(newModuleConfig); + if (shardConfig != null) { + Set replicas = new HashSet<>(shardConfig.getReplicas()); + replicas.remove(newMemberName); + updateModuleConfigMap(ModuleConfig.builder(moduleConfig).shardConfig(shardName, replicas).build()); return; } } } - private void updateModuleConfigMap(ModuleConfig moduleConfig) { - HashMap newModuleConfigMap = new HashMap<>(moduleConfigMap); + private void updateModuleConfigMap(final ModuleConfig moduleConfig) { + final Map newModuleConfigMap = new HashMap<>(moduleConfigMap); newModuleConfigMap.put(moduleConfig.getName(), moduleConfig); - moduleConfigMap = ImmutableMap.builder().putAll(newModuleConfigMap).build(); - return; + moduleConfigMap = ImmutableMap.copyOf(newModuleConfigMap); } }