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 7521: Convert byte[] to ShardManagerSnapshot in DatastoreSnapshot
[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 a26dc56a750067c026d6cacff45f2663525b72f4..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
@@
-25,10
+25,16
@@
public class ShardStrategyFactory {
public ShardStrategy getStrategy(final YangInstanceIdentifier path) {
Preconditions.checkNotNull(path, "path should not be null");
public ShardStrategy getStrategy(final YangInstanceIdentifier path) {
Preconditions.checkNotNull(path, "path should not be null");
- String moduleName = getModuleName(path);
- ShardStrategy shardStrategy = configuration.getStrategyForModule(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 DefaultShardStrategy.getInstance();
+ // retry with prefix based sharding
+ final ShardStrategy strategyForPrefix = configuration.getStrategyForPrefix(path);
+ if (strategyForPrefix == null) {
+ return DefaultShardStrategy.getInstance();
+ }
+ return strategyForPrefix;
}
return shardStrategy;
}
return shardStrategy;