}
public ConfigurationImpl(final ModuleShardConfigProvider provider) {
- this.moduleConfigMap = ImmutableMap.copyOf(provider.retrieveModuleConfigs(this));
+ ImmutableMap.Builder<String, ModuleConfig> mapBuilder = ImmutableMap.builder();
+ for(Map.Entry<String, ModuleConfig.Builder> 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());
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()));
-
- moduleConfig.addShardConfig(config.getShardName(), ImmutableSet.copyOf(config.getShardMemberNames()));
+ ModuleConfig moduleConfig = ModuleConfig.builder(config.getModuleName()).
+ nameSpace(config.getNamespace().toASCIIString()).
+ shardStrategy(createShardStrategy(config.getModuleName(), config.getShardStrategyName())).
+ shardConfig(config.getShardName(), config.getShardMemberNames()).build();
- moduleConfigMap = ImmutableMap.<String, ModuleConfig>builder().putAll(moduleConfigMap).
- put(config.getModuleName(), moduleConfig).build();
+ updateModuleConfigMap(moduleConfig);
namespaceToModuleName = ImmutableMap.<String, String>builder().putAll(namespaceToModuleName).
put(moduleConfig.getNameSpace(), moduleConfig.getName()).build();
for(ModuleConfig moduleConfig: moduleConfigMap.values()) {
ShardConfig shardConfig = moduleConfig.getShardConfig(shardName);
if(shardConfig != null) {
- ModuleConfig newModuleConfig = new ModuleConfig(moduleConfig);
- Set<String> replica = new HashSet<>(shardConfig.getReplicas());
- replica.add(newMemberName);
- newModuleConfig.addShardConfig(shardName, ImmutableSet.copyOf(replica));
- updateModuleConfigMap(newModuleConfig);
+ Set<String> replicas = new HashSet<>(shardConfig.getReplicas());
+ replicas.add(newMemberName);
+ updateModuleConfigMap(ModuleConfig.builder(moduleConfig).shardConfig(shardName, replicas).build());
return;
}
}
for(ModuleConfig moduleConfig: moduleConfigMap.values()) {
ShardConfig shardConfig = moduleConfig.getShardConfig(shardName);
if(shardConfig != null) {
- ModuleConfig newModuleConfig = new ModuleConfig(moduleConfig);
- Set<String> replica = new HashSet<>(shardConfig.getReplicas());
- replica.remove(newMemberName);
- newModuleConfig.addShardConfig(shardName, ImmutableSet.copyOf(replica));
- updateModuleConfigMap(newModuleConfig);
+ Set<String> replicas = new HashSet<>(shardConfig.getReplicas());
+ replicas.remove(newMemberName);
+ updateModuleConfigMap(ModuleConfig.builder(moduleConfig).shardConfig(shardName, replicas).build());
return;
}
}
}
private void updateModuleConfigMap(ModuleConfig moduleConfig) {
- HashMap<String, ModuleConfig> newModuleConfigMap = new HashMap<>(moduleConfigMap);
+ Map<String, ModuleConfig> newModuleConfigMap = new HashMap<>(moduleConfigMap);
newModuleConfigMap.put(moduleConfig.getName(), moduleConfig);
- moduleConfigMap = ImmutableMap.<String, ModuleConfig>builder().putAll(newModuleConfigMap).build();
- return;
+ moduleConfigMap = ImmutableMap.copyOf(newModuleConfigMap);
}
}
*/
package org.opendaylight.controller.cluster.datastore.config;
-import com.google.common.collect.ImmutableSet;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import com.typesafe.config.ConfigObject;
}
@Override
- public Map<String, ModuleConfig> retrieveModuleConfigs(Configuration configuration) {
+ public Map<String, ModuleConfig.Builder> retrieveModuleConfigs(Configuration configuration) {
File moduleShardsFile = new File("./configuration/initial/" + moduleShardsConfigPath);
File modulesFile = new File("./configuration/initial/" + modulesConfigPath);
modulesConfig = ConfigFactory.load(modulesConfigPath);
}
- Map<String, ModuleConfig> moduleConfigMap = readModuleShardsConfig(moduleShardsConfig);
+ Map<String, ModuleConfig.Builder> moduleConfigMap = readModuleShardsConfig(moduleShardsConfig);
readModulesConfig(modulesConfig, moduleConfigMap, configuration);
return moduleConfigMap;
}
- private static void readModulesConfig(final Config modulesConfig, Map<String, ModuleConfig> moduleConfigMap,
+ private static void readModulesConfig(final Config modulesConfig, Map<String, ModuleConfig.Builder> moduleConfigMap,
Configuration configuration) {
List<? extends ConfigObject> modulesConfigObjectList = modulesConfig.getObjectList("modules");
ConfigObjectWrapper w = new ConfigObjectWrapper(o);
String moduleName = w.stringValue("name");
- ModuleConfig moduleConfig = moduleConfigMap.get(moduleName);
- if(moduleConfig == null) {
- moduleConfig = new ModuleConfig(moduleName);
- moduleConfigMap.put(moduleName, moduleConfig);
+ ModuleConfig.Builder builder = moduleConfigMap.get(moduleName);
+ if(builder == null) {
+ builder = ModuleConfig.builder(moduleName);
+ moduleConfigMap.put(moduleName, builder);
}
- moduleConfig.setNameSpace(w.stringValue("namespace"));
- moduleConfig.setShardStrategy(ShardStrategyFactory.newShardStrategyInstance(moduleName,
+ builder.nameSpace(w.stringValue("namespace"));
+ builder.shardStrategy(ShardStrategyFactory.newShardStrategyInstance(moduleName,
w.stringValue("shard-strategy"), configuration));
}
}
- private static Map<String, ModuleConfig> readModuleShardsConfig(final Config moduleShardsConfig) {
+ private static Map<String, ModuleConfig.Builder> readModuleShardsConfig(final Config moduleShardsConfig) {
List<? extends ConfigObject> moduleShardsConfigObjectList =
moduleShardsConfig.getObjectList("module-shards");
- Map<String, ModuleConfig> moduleConfigMap = new HashMap<>();
+ Map<String, ModuleConfig.Builder> moduleConfigMap = new HashMap<>();
for(ConfigObject moduleShardConfigObject : moduleShardsConfigObjectList){
String moduleName = moduleShardConfigObject.get("name").unwrapped().toString();
- ModuleConfig moduleConfig = new ModuleConfig(moduleName);
+ ModuleConfig.Builder builder = ModuleConfig.builder(moduleName);
List<? extends ConfigObject> shardsConfigObjectList =
moduleShardConfigObject.toConfig().getObjectList("shards");
for(ConfigObject shard : shardsConfigObjectList){
String shardName = shard.get("name").unwrapped().toString();
List<String> replicas = shard.toConfig().getStringList("replicas");
- moduleConfig.addShardConfig(shardName, ImmutableSet.copyOf(replicas));
+ builder.shardConfig(shardName, replicas);
}
- moduleConfigMap.put(moduleName, moduleConfig);
+ moduleConfigMap.put(moduleName, builder);
}
return moduleConfigMap;
*/
package org.opendaylight.controller.cluster.datastore.config;
-import com.google.common.collect.ImmutableSet;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import java.util.Set;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategy;
/**
*/
public class ModuleConfig {
private final String name;
- private String nameSpace;
- private ShardStrategy shardStrategy;
- private final Map<String, ShardConfig> shardConfigs = new HashMap<>();
+ private final String nameSpace;
+ private final ShardStrategy shardStrategy;
+ private final Map<String, ShardConfig> shardConfigs;
- public ModuleConfig(final String name) {
+ private ModuleConfig(String name, String nameSpace, ShardStrategy shardStrategy,
+ Map<String, ShardConfig> shardConfigs) {
this.name = name;
+ this.nameSpace = nameSpace;
+ this.shardStrategy = shardStrategy;
+ this.shardConfigs = shardConfigs;
}
- public ModuleConfig(ModuleConfig moduleConfig) {
- this.name = moduleConfig.getName();
- this.nameSpace = moduleConfig.getNameSpace();
- this.shardStrategy = moduleConfig.getShardStrategy();
- for (ShardConfig shardConfig : moduleConfig.getShardConfigs()) {
- shardConfigs.put(shardConfig.getName(), new ShardConfig(shardConfig.getName(),
- ImmutableSet.copyOf(shardConfig.getReplicas())));
- }
- }
-
+ @Nonnull
public String getName() {
return name;
}
+ @Nullable
public String getNameSpace() {
return nameSpace;
}
+ @Nullable
public ShardStrategy getShardStrategy() {
return shardStrategy;
}
+ @Nullable
public ShardConfig getShardConfig(String name) {
return shardConfigs.get(name);
}
+ @Nonnull
public Collection<ShardConfig> getShardConfigs() {
return shardConfigs.values();
}
+ @Nonnull
public Collection<String> getShardNames() {
return shardConfigs.keySet();
}
- public void addShardConfig(String name, Set<String> replicas) {
- shardConfigs.put(name, new ShardConfig(name, replicas));
+ public static Builder builder(String name) {
+ return new Builder(name);
}
- public void setNameSpace(String nameSpace) {
- this.nameSpace = nameSpace;
+ public static Builder builder(ModuleConfig moduleConfig) {
+ return new Builder(moduleConfig);
}
- public void setShardStrategy(ShardStrategy shardStrategy) {
- this.shardStrategy = shardStrategy;
- }
+ public static class Builder {
+ private String name;
+ private String nameSpace;
+ private ShardStrategy shardStrategy;
+ private final Map<String, ShardConfig> shardConfigs = new HashMap<>();
- public ShardConfig removeShardConfig(String name) {
- return shardConfigs.remove(name);
+ private Builder(String name) {
+ this.name = name;
+ }
+
+ private Builder(ModuleConfig moduleConfig) {
+ this.name = moduleConfig.getName();
+ this.nameSpace = moduleConfig.getNameSpace();
+ this.shardStrategy = moduleConfig.getShardStrategy();
+ for (ShardConfig shardConfig : moduleConfig.getShardConfigs()) {
+ shardConfigs.put(shardConfig.getName(), shardConfig);
+ }
+ }
+
+ public Builder name(String name) {
+ this.name = name;
+ return this;
+ }
+
+ public Builder nameSpace(String nameSpace) {
+ this.nameSpace = nameSpace;
+ return this;
+ }
+
+ public Builder shardStrategy(ShardStrategy shardStrategy) {
+ this.shardStrategy = shardStrategy;
+ return this;
+ }
+
+ public Builder shardConfig(String name, Collection<String> replicas) {
+ shardConfigs.put(name, new ShardConfig(name, replicas));
+ return this;
+ }
+
+ public ModuleConfig build() {
+ return new ModuleConfig(Preconditions.checkNotNull(name), nameSpace, shardStrategy,
+ ImmutableMap.copyOf(shardConfigs));
+ }
}
}
*/
public interface ModuleShardConfigProvider {
/**
- * Returns a Map of ModuleConfig instances keyed by module name.
+ * Returns a Map of ModuleConfig Builder instances keyed by module name.
*/
- @Nonnull Map<String, ModuleConfig> retrieveModuleConfigs(@Nonnull Configuration configuration);
+ @Nonnull Map<String, ModuleConfig.Builder> retrieveModuleConfigs(@Nonnull Configuration configuration);
}
*/
package org.opendaylight.controller.cluster.datastore.config;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableSet;
+import java.util.Collection;
import java.util.Set;
+import javax.annotation.Nonnull;
/**
* Encapsulated configuration for a shard.
private final String name;
private final Set<String> replicas;
- public ShardConfig(final String name, final Set<String> replicas) {
- this.name = name;
- this.replicas = replicas;
+ public ShardConfig(@Nonnull final String name, @Nonnull final Collection<String> replicas) {
+ this.name = Preconditions.checkNotNull(name);
+ this.replicas = ImmutableSet.copyOf(Preconditions.checkNotNull(replicas));
}
+ @Nonnull
public String getName() {
return name;
}
+ @Nonnull
public Set<String> getReplicas() {
return replicas;
}
public class EmptyModuleShardConfigProvider implements ModuleShardConfigProvider {
@Override
- public Map<String, ModuleConfig> retrieveModuleConfigs(Configuration configuration) {
+ public Map<String, ModuleConfig.Builder> retrieveModuleConfigs(Configuration configuration) {
return Collections.emptyMap();
}
}
import com.google.common.collect.Sets;
import com.google.common.util.concurrent.Uninterruptibles;
import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import org.opendaylight.controller.cluster.datastore.ShardDataTree;
import org.opendaylight.controller.cluster.datastore.config.Configuration;
import org.opendaylight.controller.cluster.datastore.config.ConfigurationImpl;
-import org.opendaylight.controller.cluster.datastore.config.ModuleConfig;
-import org.opendaylight.controller.cluster.datastore.config.ModuleShardConfigProvider;
+import org.opendaylight.controller.cluster.datastore.config.EmptyModuleShardConfigProvider;
import org.opendaylight.controller.cluster.datastore.entityownership.messages.RegisterCandidateLocal;
import org.opendaylight.controller.cluster.datastore.entityownership.messages.RegisterListenerLocal;
import org.opendaylight.controller.cluster.datastore.entityownership.messages.UnregisterCandidateLocal;
DatastoreContext datastoreContext = DatastoreContext.newBuilder().dataStoreType(dataStoreType).
shardInitializationTimeout(10, TimeUnit.SECONDS).build();
- ModuleShardConfigProvider configProvider = new ModuleShardConfigProvider() {
- @Override
- public Map<String, ModuleConfig> retrieveModuleConfigs(Configuration configuration) {
- return Collections.emptyMap();
- }
- };
- Configuration configuration = new ConfigurationImpl(configProvider) {
+ Configuration configuration = new ConfigurationImpl(new EmptyModuleShardConfigProvider()) {
@Override
public Collection<String> getUniqueMemberNamesForAllShards() {
return Sets.newHashSet("member-1");
package org.opendaylight.controller.cluster.datastore.utils;
-import com.google.common.collect.Sets;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
public MockConfiguration(final Map<String, List<String>> shardMembers) {
super(new ModuleShardConfigProvider() {
@Override
- public Map<String, ModuleConfig> retrieveModuleConfigs(Configuration configuration) {
- Map<String, ModuleConfig> retMap = new HashMap<String, ModuleConfig>();
+ public Map<String, ModuleConfig.Builder> retrieveModuleConfigs(Configuration configuration) {
+ Map<String, ModuleConfig.Builder> retMap = new HashMap<>();
for(Map.Entry<String, List<String>> e : shardMembers.entrySet()) {
String shardName = e.getKey();
- ModuleConfig mc = new ModuleConfig(shardName);
- mc.addShardConfig(shardName, Sets.newHashSet(e.getValue()));
- retMap.put(mc.getName(), mc);
+ retMap.put(shardName, ModuleConfig.builder(shardName).shardConfig(shardName, e.getValue()));
}
return retMap;