* 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.AbstractMap.SimpleEntry;
+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 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.mdsal.dom.api.DOMDataTreeIdentifier;
-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
+// FIXME: Non-final for testing
public class ConfigurationImpl implements Configuration {
private volatile Map<String, ModuleConfig> moduleConfigMap;
- // TODO should this be initialized with something? on restart we should restore the shards from configuration?
- private volatile Map<DOMDataTreeIdentifier, PrefixShardConfiguration> prefixConfigMap = Collections.emptyMap();
-
// Look up maps to speed things up
private volatile Map<String, String> namespaceToModuleName;
this(new FileModuleShardConfigProvider(moduleShardsConfigPath, modulesConfigPath));
}
+ @SuppressFBWarnings(value = "MC_OVERRIDABLE_METHOD_CALL_IN_CONSTRUCTOR", justification = "Subclassed for testing")
public ConfigurationImpl(final ModuleShardConfigProvider provider) {
ImmutableMap.Builder<String, ModuleConfig> mapBuilder = ImmutableMap.builder();
- for (Map.Entry<String, ModuleConfig.Builder> e: provider.retrieveModuleConfigs(this).entrySet()) {
+ for (Entry<String, ModuleConfig.Builder> e: provider.retrieveModuleConfigs(this).entrySet()) {
mapBuilder.put(e.getKey(), e.getValue().build());
}
- this.moduleConfigMap = mapBuilder.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) {
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) {
@Override
public Collection<String> getMemberShardNames(final MemberName memberName) {
- Preconditions.checkNotNull(memberName, "memberName should not be null");
+ requireNonNull(memberName, "memberName should not be null");
List<String> shards = new ArrayList<>();
for (ModuleConfig moduleConfig: moduleConfigMap.values()) {
@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);
+ 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 = moduleConfigMap.get(moduleName);
- Collection<ShardConfig> shardConfigs = moduleConfig != null ? moduleConfig.getShardConfigs() :
- Collections.<ShardConfig>emptySet();
- return !shardConfigs.isEmpty() ? shardConfigs.iterator().next().getName() : null;
- }
-
- @Nullable
- @Override
- public String getShardNameForPrefix(@Nonnull final DOMDataTreeIdentifier prefix) {
- Preconditions.checkNotNull(prefix, "prefix should not be null");
-
- Entry<DOMDataTreeIdentifier, PrefixShardConfiguration> bestMatchEntry =
- new SimpleEntry<>(
- new DOMDataTreeIdentifier(prefix.getDatastoreType(), YangInstanceIdentifier.EMPTY), null);
-
- for (Entry<DOMDataTreeIdentifier, PrefixShardConfiguration> entry : prefixConfigMap.entrySet()) {
- if (entry.getKey().contains(prefix) && entry.getKey().getRootIdentifier().getPathArguments().size()
- > bestMatchEntry.getKey().getRootIdentifier().getPathArguments().size()) {
- bestMatchEntry = entry;
+ ModuleConfig moduleConfig = getModuleConfig(moduleName);
+ if (moduleConfig != null) {
+ Collection<ShardConfig> shardConfigs = moduleConfig.getShardConfigs();
+ if (!shardConfigs.isEmpty()) {
+ return shardConfigs.iterator().next().getName();
}
}
+ return null;
+ }
- //TODO we really should have mapping based on prefix instead of Strings
- return ClusterUtils.getCleanShardName(bestMatchEntry.getKey().getRootIdentifier());
+ private ModuleConfig getModuleConfig(final String moduleName) {
+ return moduleConfigMap.get(requireNonNull(moduleName, "moduleName should not be null"));
}
@Override
}
}
- for (final PrefixShardConfiguration prefixConfig : prefixConfigMap.values()) {
- if (shardName.equals(ClusterUtils.getCleanShardName(prefixConfig.getPrefix().getRootIdentifier()))) {
- return prefixConfig.getShardMemberNames();
- }
- }
-
- return Collections.emptyList();
+ return List.of();
}
private static void checkNotNullShardName(final String shardName) {
- Preconditions.checkNotNull(shardName, "shardName should not be null");
+ requireNonNull(shardName, "shardName should not be null");
}
@Override
}
@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 = ModuleConfig.builder(config.getModuleName())
- .nameSpace(config.getNamespace().toASCIIString())
+ .nameSpace(config.getNamespace().toString())
.shardStrategy(createShardStrategy(config.getModuleName(), config.getShardStrategyName()))
.shardConfig(config.getShardName(), config.getShardMemberNames()).build();
allShardNames = ImmutableSet.<String>builder().addAll(allShardNames).add(config.getShardName()).build();
}
- @Override
- public void addPrefixShardConfiguration(@Nonnull final PrefixShardConfiguration config) {
- Preconditions.checkNotNull(config, "PrefixShardConfiguration cannot be null");
- addPrefixConfig(config);
- allShardNames = ImmutableSet.<String>builder().addAll(allShardNames)
- .add(ClusterUtils.getCleanShardName(config.getPrefix().getRootIdentifier())).build();
- }
-
- @Override
- public void removePrefixShardConfiguration(@Nonnull final DOMDataTreeIdentifier prefix) {
- Preconditions.checkNotNull(prefix, "Prefix cannot be null");
-
- removePrefixConfig(prefix);
-
- final HashSet<String> temp = new HashSet<>(allShardNames);
- temp.remove(ClusterUtils.getCleanShardName(prefix.getRootIdentifier()));
-
- allShardNames = ImmutableSet.copyOf(temp);
- }
-
- @Override
- public Map<DOMDataTreeIdentifier, PrefixShardConfiguration> getAllPrefixShardConfigurations() {
- return ImmutableMap.copyOf(prefixConfigMap);
- }
-
- private void addPrefixConfig(final PrefixShardConfiguration config) {
- final Map<DOMDataTreeIdentifier, PrefixShardConfiguration> newPrefixConfigMap = new HashMap<>(prefixConfigMap);
- newPrefixConfigMap.put(config.getPrefix(), config);
- prefixConfigMap = ImmutableMap.copyOf(newPrefixConfigMap);
- }
-
- private void removePrefixConfig(final DOMDataTreeIdentifier prefix) {
- final Map<DOMDataTreeIdentifier, PrefixShardConfiguration> newPrefixConfigMap = new HashMap<>(prefixConfigMap);
- newPrefixConfigMap.remove(prefix);
- prefixConfigMap = ImmutableMap.copyOf(newPrefixConfigMap);
- }
-
- 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) {
+ public boolean isShardConfigured(final String shardName) {
checkNotNullShardName(shardName);
return allShardNames.contains(shardName);
}
@Override
- public void addMemberReplicaForShard(String shardName, MemberName newMemberName) {
+ public void addMemberReplicaForShard(final String shardName, final MemberName newMemberName) {
checkNotNullShardName(shardName);
- Preconditions.checkNotNull(newMemberName, "MemberName should not be null");
+ requireNonNull(newMemberName, "MemberName should not be null");
for (ModuleConfig moduleConfig: moduleConfigMap.values()) {
ShardConfig shardConfig = moduleConfig.getShardConfig(shardName);
}
@Override
- public void removeMemberReplicaForShard(String shardName, MemberName newMemberName) {
+ public void removeMemberReplicaForShard(final String shardName, final MemberName newMemberName) {
checkNotNullShardName(shardName);
- Preconditions.checkNotNull(newMemberName, "MemberName should not be null");
+ requireNonNull(newMemberName, "MemberName should not be null");
for (ModuleConfig moduleConfig: moduleConfigMap.values()) {
ShardConfig shardConfig = moduleConfig.getShardConfig(shardName);
}
}
- @Override
- public ShardStrategy getStrategyForPrefix(@Nonnull final DOMDataTreeIdentifier prefix) {
- Preconditions.checkNotNull(prefix, "Prefix cannot be null");
- // FIXME using prefix tables like in mdsal will be better
- Entry<DOMDataTreeIdentifier, PrefixShardConfiguration> bestMatchEntry =
- new SimpleEntry<>(
- new DOMDataTreeIdentifier(prefix.getDatastoreType(), YangInstanceIdentifier.EMPTY), null);
-
- for (Entry<DOMDataTreeIdentifier, PrefixShardConfiguration> entry : prefixConfigMap.entrySet()) {
- if (entry.getKey().contains(prefix) && entry.getKey().getRootIdentifier().getPathArguments().size()
- > bestMatchEntry.getKey().getRootIdentifier().getPathArguments().size()) {
- bestMatchEntry = entry;
- }
- }
-
- if (bestMatchEntry.getValue() == null) {
- return null;
- }
- return new PrefixShardStrategy(ClusterUtils
- .getCleanShardName(bestMatchEntry.getKey().getRootIdentifier()),
- bestMatchEntry.getKey().getRootIdentifier());
- }
-
private void updateModuleConfigMap(final ModuleConfig moduleConfig) {
final Map<String, ModuleConfig> newModuleConfigMap = new HashMap<>(moduleConfigMap);
newModuleConfigMap.put(moduleConfig.getName(), moduleConfig);
Code Review / controller.git / blobdiff