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=59acdbdb01f8346232123e5952951a76b073a8c6;hb=5370e8be094b802caa732efb4da5a035c53dc9c6;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..59acdbdb01 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 @@ -11,6 +11,7 @@ package org.opendaylight.controller.cluster.datastore.config; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import java.util.AbstractMap.SimpleEntry; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -18,13 +19,24 @@ 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 javax.annotation.Nonnull; +import javax.annotation.Nullable; +import org.opendaylight.controller.cluster.access.concepts.MemberName; +import org.opendaylight.controller.cluster.datastore.shardstrategy.PrefixShardStrategy; import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategy; import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategyFactory; +import org.opendaylight.controller.cluster.datastore.utils.ClusterUtils; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +// TODO clean this up once we get rid of module based configuration, prefix one should be alot simpler public class ConfigurationImpl implements Configuration { private volatile Map moduleConfigMap; + // TODO should this be initialized with something? on restart we should restore the shards from configuration? + private volatile Map prefixConfigMap = Collections.emptyMap(); + // Look up maps to speed things up private volatile Map namespaceToModuleName; @@ -35,7 +47,12 @@ 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()); @@ -43,7 +60,7 @@ public class ConfigurationImpl implements Configuration { private static Set createAllShardNames(Iterable moduleConfigs) { final ImmutableSet.Builder builder = ImmutableSet.builder(); - for(ModuleConfig moduleConfig : moduleConfigs) { + for (ModuleConfig moduleConfig : moduleConfigs) { builder.addAll(moduleConfig.getShardNames()); } @@ -52,9 +69,9 @@ public class ConfigurationImpl implements Configuration { private static Map createNamespaceToModuleName(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 +79,13 @@ public class ConfigurationImpl implements Configuration { } @Override - public Collection getMemberShardNames(final String memberName){ + public Collection getMemberShardNames(final MemberName memberName) { Preconditions.checkNotNull(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()); } } @@ -89,7 +106,7 @@ public class ConfigurationImpl implements Configuration { Preconditions.checkNotNull(moduleName, "moduleName should not be null"); ModuleConfig moduleConfig = moduleConfigMap.get(moduleName); - return moduleConfig != null ? moduleConfig.getShardStrategy(): null; + return moduleConfig != null ? moduleConfig.getShardStrategy() : null; } @Override @@ -99,20 +116,45 @@ public class ConfigurationImpl implements Configuration { ModuleConfig moduleConfig = moduleConfigMap.get(moduleName); Collection shardConfigs = moduleConfig != null ? moduleConfig.getShardConfigs() : Collections.emptySet(); - return !shardConfigs.isEmpty() ? shardConfigs.iterator().next().getName(): null; + return !shardConfigs.isEmpty() ? shardConfigs.iterator().next().getName() : null; + } + + @Nullable + @Override + public String getShardNameForPrefix(@Nonnull final YangInstanceIdentifier prefix) { + Preconditions.checkNotNull(prefix, "prefix should not be null"); + + Entry bestMatchEntry = + new SimpleEntry<>(YangInstanceIdentifier.EMPTY, null); + + for (Entry entry : prefixConfigMap.entrySet()) { + if (entry.getKey().contains(prefix) && entry.getKey().getPathArguments().size() + > bestMatchEntry.getKey().getPathArguments().size()) { + bestMatchEntry = entry; + } + } + + //TODO we really should have mapping based on prefix instead of Strings + return ClusterUtils.getCleanShardName(bestMatchEntry.getValue().getPrefix().getRootIdentifier()); } @Override - public Collection getMembersFromShardName(final String shardName) { + public Collection getMembersFromShardName(final String shardName) { Preconditions.checkNotNull(shardName, "shardName should not be null"); - for(ModuleConfig moduleConfig: moduleConfigMap.values()) { + for (ModuleConfig moduleConfig: moduleConfigMap.values()) { ShardConfig shardConfig = moduleConfig.getShardConfig(shardName); - if(shardConfig != null) { + if (shardConfig != null) { return shardConfig.getReplicas(); } } + for (final PrefixShardConfiguration prefixConfig : prefixConfigMap.values()) { + if (shardName.equals(ClusterUtils.getCleanShardName(prefixConfig.getPrefix().getRootIdentifier()))) { + return prefixConfig.getShardMemberNames(); + } + } + return Collections.emptyList(); } @@ -122,9 +164,9 @@ public class ConfigurationImpl implements Configuration { } @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)); } @@ -135,20 +177,32 @@ public class ConfigurationImpl implements Configuration { 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 moduleConfig = ModuleConfig.builder(config.getModuleName()) + .nameSpace(config.getNamespace().toASCIIString()) + .shardStrategy(createShardStrategy(config.getModuleName(), config.getShardStrategyName())) + .shardConfig(config.getShardName(), config.getShardMemberNames()).build(); - moduleConfig.addShardConfig(config.getShardName(), ImmutableSet.copyOf(config.getShardMemberNames())); + updateModuleConfigMap(moduleConfig); - moduleConfigMap = ImmutableMap.builder().putAll(moduleConfigMap). - put(config.getModuleName(), moduleConfig).build(); - - 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(); } + @Override + public void addPrefixShardConfiguration(@Nonnull final PrefixShardConfiguration config) { + Preconditions.checkNotNull(config, "PrefixShardConfiguration cannot be null"); + updatePrefixConfigMap(config); + allShardNames = ImmutableSet.builder().addAll(allShardNames) + .add(ClusterUtils.getCleanShardName(config.getPrefix().getRootIdentifier())).build(); + } + + private void updatePrefixConfigMap(final PrefixShardConfiguration config) { + final Map newPrefixConfigMap = new HashMap<>(prefixConfigMap); + newPrefixConfigMap.put(config.getPrefix().getRootIdentifier(), config); + prefixConfigMap = ImmutableMap.copyOf(newPrefixConfigMap); + } + private ShardStrategy createShardStrategy(String moduleName, String shardStrategyName) { return ShardStrategyFactory.newShardStrategyInstance(moduleName, shardStrategyName, this); } @@ -160,45 +214,61 @@ public class ConfigurationImpl implements Configuration { } @Override - public void addMemberReplicaForShard (String shardName, String newMemberName) { + public void addMemberReplicaForShard(String shardName, MemberName newMemberName) { Preconditions.checkNotNull(shardName, "shardName should not be null"); Preconditions.checkNotNull(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) { + public void removeMemberReplicaForShard(String shardName, MemberName newMemberName) { Preconditions.checkNotNull(shardName, "shardName should not be null"); Preconditions.checkNotNull(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); + @Override + public ShardStrategy getStrategyForPrefix(@Nonnull final YangInstanceIdentifier prefix) { + Preconditions.checkNotNull(prefix, "Prefix cannot be null"); + // FIXME using prefix tables like in mdsal will be better + Entry bestMatchEntry = + new SimpleEntry<>(YangInstanceIdentifier.EMPTY, null); + + for (Entry entry : prefixConfigMap.entrySet()) { + if (entry.getKey().contains(prefix) && entry.getKey().getPathArguments().size() + > bestMatchEntry.getKey().getPathArguments().size()) { + bestMatchEntry = entry; + } + } + + if (bestMatchEntry.getValue() == null) { + return null; + } + return new PrefixShardStrategy( + ClusterUtils.getCleanShardName(bestMatchEntry.getValue().getPrefix().getRootIdentifier()), this); + } + + 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); } }