* 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 edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
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;
+// FIXME: Non-final for testing
public class ConfigurationImpl implements Configuration {
private volatile Map<String, ModuleConfig> moduleConfigMap;
this(new FileModuleShardConfigProvider(moduleShardsConfigPath, modulesConfigPath));
}
+ @SuppressFBWarnings(value = "MC_OVERRIDABLE_METHOD_CALL_IN_CONSTRUCTOR", justification = "Subclassed for testing")
public ConfigurationImpl(final ModuleShardConfigProvider provider) {
- this.moduleConfigMap = ImmutableMap.copyOf(provider.retrieveModuleConfigs(this));
+ ImmutableMap.Builder<String, ModuleConfig> mapBuilder = ImmutableMap.builder();
+ for (Entry<String, ModuleConfig.Builder> e: provider.retrieveModuleConfigs(this).entrySet()) {
+ mapBuilder.put(e.getKey(), e.getValue().build());
+ }
+
+ moduleConfigMap = mapBuilder.build();
- this.allShardNames = createAllShardNames(moduleConfigMap.values());
- this.namespaceToModuleName = createNamespaceToModuleName(moduleConfigMap.values());
+ allShardNames = createAllShardNames(moduleConfigMap.values());
+ namespaceToModuleName = createNamespaceToModuleName(moduleConfigMap.values());
}
- private static Set<String> createAllShardNames(Iterable<ModuleConfig> moduleConfigs) {
+ private static Set<String> createAllShardNames(final Iterable<ModuleConfig> moduleConfigs) {
final ImmutableSet.Builder<String> builder = ImmutableSet.builder();
- for(ModuleConfig moduleConfig : moduleConfigs) {
+ for (ModuleConfig moduleConfig : moduleConfigs) {
builder.addAll(moduleConfig.getShardNames());
}
return builder.build();
}
- private static Map<String, String> createNamespaceToModuleName(Iterable<ModuleConfig> moduleConfigs) {
+ private static Map<String, String> createNamespaceToModuleName(final Iterable<ModuleConfig> moduleConfigs) {
final ImmutableMap.Builder<String, String> 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());
}
}
}
@Override
- public Collection<String> getMemberShardNames(final String memberName){
- Preconditions.checkNotNull(memberName, "memberName should not be null");
+ public Collection<String> getMemberShardNames(final MemberName memberName) {
+ requireNonNull(memberName, "memberName should not be null");
List<String> 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());
}
}
@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<ShardConfig> shardConfigs = moduleConfig.getShardConfigs();
+ if (!shardConfigs.isEmpty()) {
+ return shardConfigs.iterator().next().getName();
+ }
+ }
+ return null;
+ }
- ModuleConfig moduleConfig = moduleConfigMap.get(moduleName);
- Collection<ShardConfig> shardConfigs = moduleConfig != null ? moduleConfig.getShardConfigs() :
- Collections.<ShardConfig>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<String> getMembersFromShardName(final String shardName) {
- Preconditions.checkNotNull(shardName, "shardName should not be null");
+ public Collection<MemberName> 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();
}
}
- return Collections.emptyList();
+ return List.of();
+ }
+
+ private static void checkNotNullShardName(final String shardName) {
+ requireNonNull(shardName, "shardName should not be null");
}
@Override
}
@Override
- public Collection<String> getUniqueMemberNamesForAllShards() {
- Set<String> allNames = new HashSet<>();
- for(String shardName: getAllShardNames()) {
+ public Collection<MemberName> getUniqueMemberNamesForAllShards() {
+ Set<MemberName> allNames = new HashSet<>();
+ for (String shardName: getAllShardNames()) {
allNames.addAll(getMembersFromShardName(shardName));
}
}
@Override
- public synchronized void addModuleShardConfiguration(ModuleShardConfiguration config) {
- Preconditions.checkNotNull(config, "ModuleShardConfiguration should not be null");
+ public synchronized void addModuleShardConfiguration(final ModuleShardConfiguration config) {
+ requireNonNull(config, "ModuleShardConfiguration should not be null");
- ModuleConfig moduleConfig = new ModuleConfig(config.getModuleName());
- moduleConfig.setNameSpace(config.getNamespace().toASCIIString());
- moduleConfig.setShardStrategy(createShardStrategy(config.getModuleName(), config.getShardStrategyName()));
+ ModuleConfig moduleConfig = ModuleConfig.builder(config.getModuleName())
+ .nameSpace(config.getNamespace().toString())
+ .shardStrategy(createShardStrategy(config.getModuleName(), config.getShardStrategyName()))
+ .shardConfig(config.getShardName(), config.getShardMemberNames()).build();
- moduleConfig.addShardConfig(config.getShardName(), ImmutableSet.copyOf(config.getShardMemberNames()));
+ updateModuleConfigMap(moduleConfig);
- moduleConfigMap = ImmutableMap.<String, ModuleConfig>builder().putAll(moduleConfigMap).
- put(config.getModuleName(), moduleConfig).build();
-
- namespaceToModuleName = ImmutableMap.<String, String>builder().putAll(namespaceToModuleName).
- put(moduleConfig.getNameSpace(), moduleConfig.getName()).build();
+ namespaceToModuleName = ImmutableMap.<String, String>builder().putAll(namespaceToModuleName)
+ .put(moduleConfig.getNamespace(), moduleConfig.getName()).build();
allShardNames = ImmutableSet.<String>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(final String shardName, final MemberName newMemberName) {
+ checkNotNullShardName(shardName);
+ requireNonNull(newMemberName, "MemberName should not be null");
+
+ for (ModuleConfig moduleConfig: moduleConfigMap.values()) {
+ ShardConfig shardConfig = moduleConfig.getShardConfig(shardName);
+ if (shardConfig != null) {
+ Set<MemberName> replicas = new HashSet<>(shardConfig.getReplicas());
+ replicas.add(newMemberName);
+ updateModuleConfigMap(ModuleConfig.builder(moduleConfig).shardConfig(shardName, replicas).build());
+ return;
+ }
+ }
+ }
+
+ @Override
+ public void removeMemberReplicaForShard(final String shardName, final MemberName newMemberName) {
+ checkNotNullShardName(shardName);
+ requireNonNull(newMemberName, "MemberName should not be null");
+
+ for (ModuleConfig moduleConfig: moduleConfigMap.values()) {
+ ShardConfig shardConfig = moduleConfig.getShardConfig(shardName);
+ if (shardConfig != null) {
+ Set<MemberName> replicas = new HashSet<>(shardConfig.getReplicas());
+ replicas.remove(newMemberName);
+ updateModuleConfigMap(ModuleConfig.builder(moduleConfig).shardConfig(shardName, replicas).build());
+ return;
+ }
+ }
+ }
+
+ private void updateModuleConfigMap(final ModuleConfig moduleConfig) {
+ final Map<String, ModuleConfig> newModuleConfigMap = new HashMap<>(moduleConfigMap);
+ newModuleConfigMap.put(moduleConfig.getName(), moduleConfig);
+ moduleConfigMap = ImmutableMap.copyOf(newModuleConfigMap);
+ }
}
Code Review / controller.git / blobdiff