X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fshardstrategy%2FShardStrategyFactory.java;h=a97adc27308fdbc265d06e925a50a982f2fd22b7;hb=95c296a7c1e8e186a88a0a0dc82e080b2185db33;hp=a26dc56a750067c026d6cacff45f2663525b72f4;hpb=925cb4a228d0fda99c7bfeb432eb25285a223887;p=controller.git

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 a26dc56a75..a97adc2730 100644
--- 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");
 
-        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) {
-            return DefaultShardStrategy.getInstance();
+            // retry with prefix based sharding
+            final ShardStrategy strategyForPrefix = configuration.getStrategyForPrefix(path);
+            if (strategyForPrefix == null) {
+                return DefaultShardStrategy.getInstance();
+            }
+            return strategyForPrefix;
         }
 
         return shardStrategy;