Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG 2138: Introduce prefix based shards into ShardManager
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
shardstrategy
/
ShardStrategyFactory.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardstrategy/ShardStrategyFactory.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardstrategy/ShardStrategyFactory.java
index f4ab8fab6f768e84bd48c15ebc83e862315e09eb..a97adc27308fdbc265d06e925a50a982f2fd22b7 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardstrategy/ShardStrategyFactory.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardstrategy/ShardStrategyFactory.java
@@
-8,52
+8,54
@@
package org.opendaylight.controller.cluster.datastore.shardstrategy;
package org.opendaylight.controller.cluster.datastore.shardstrategy;
-import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.base.Preconditions;
-import org.opendaylight.controller.cluster.datastore.Configuration;
+import org.opendaylight.controller.cluster.datastore.
config.
Configuration;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
public class ShardStrategyFactory {
public class ShardStrategyFactory {
- private static Map<String, ShardStrategy> moduleNameToStrategyMap =
- new ConcurrentHashMap();
-
private static final String UNKNOWN_MODULE_NAME = "unknown";
private static final String UNKNOWN_MODULE_NAME = "unknown";
- private static Configuration configuration;
+ private final Configuration configuration;
- public
static void setConfiguration(Configuration configuration)
{
-
ShardStrategyFactory.configuration = configuration
;
-
moduleNameToStrategyMap = configuration.getModuleNameToShardStrategyMap()
;
+ public
ShardStrategyFactory(final Configuration configuration)
{
+
Preconditions.checkState(configuration != null, "configuration should not be missing")
;
+
this.configuration = configuration
;
}
}
- public static ShardStrategy getStrategy(YangInstanceIdentifier path) {
- Preconditions.checkState(configuration != null, "configuration should not be missing");
+ public ShardStrategy getStrategy(final YangInstanceIdentifier path) {
Preconditions.checkNotNull(path, "path should not be null");
Preconditions.checkNotNull(path, "path should not be null");
-
- String moduleName = getModuleName(path);
-
ShardStrategy shardStrategy = moduleNameToStrategyMap.get
(moduleName);
+ // try with the legacy module based shard mapping
+
final
String moduleName = getModuleName(path);
+
final ShardStrategy shardStrategy = configuration.getStrategyForModule
(moduleName);
if (shardStrategy == null) {
if (shardStrategy == null) {
- return new DefaultShardStrategy();
+ // retry with prefix based sharding
+ final ShardStrategy strategyForPrefix = configuration.getStrategyForPrefix(path);
+ if (strategyForPrefix == null) {
+ return DefaultShardStrategy.getInstance();
+ }
+ return strategyForPrefix;
}
return shardStrategy;
}
}
return shardStrategy;
}
+ public static ShardStrategy newShardStrategyInstance(String moduleName, String strategyName,
+ Configuration configuration) {
+ if (ModuleShardStrategy.NAME.equals(strategyName)) {
+ return new ModuleShardStrategy(moduleName, configuration);
+ }
- private static String getModuleName(YangInstanceIdentifier path) {
- String namespace = path.getPathArguments().iterator().next().getNodeType().getNamespace().toASCIIString();
-
- Optional<String> optional =
- configuration.getModuleNameFromNameSpace(namespace);
+ return DefaultShardStrategy.getInstance();
+ }
- if(!optional.isPresent()){
+ private String getModuleName(final YangInstanceIdentifier path) {
+ if (path.isEmpty()) {
return UNKNOWN_MODULE_NAME;
}
return UNKNOWN_MODULE_NAME;
}
- return optional.get();
+ String namespace = path.getPathArguments().iterator().next().getNodeType().getNamespace().toASCIIString();
+ String moduleName = configuration.getModuleNameFromNameSpace(namespace);
+ return moduleName != null ? moduleName : UNKNOWN_MODULE_NAME;
}
}
}
}