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%2Fconfig%2Fyang%2Fconfig%2Fdistributed_datastore_provider%2FDistributedOperationalDataStoreProviderModule.java;h=e9c34545b6be48dfe0f3eb55ed4b256f79f5b8d8;hb=f41c5e6e6f6e10b36b1e4b1992877e38e718c8fb;hp=44146aa8bb98a48567696d282386fc32075e053b;hpb=b25ae9347455b1bae8f25424a9ceffc017f2f0db;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedOperationalDataStoreProviderModule.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedOperationalDataStoreProviderModule.java index 44146aa8bb..e9c34545b6 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedOperationalDataStoreProviderModule.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedOperationalDataStoreProviderModule.java @@ -10,12 +10,14 @@ package org.opendaylight.controller.config.yang.config.distributed_datastore_pro import org.opendaylight.controller.cluster.datastore.DatastoreContext; import org.opendaylight.controller.cluster.datastore.DistributedDataStoreInterface; +import org.opendaylight.controller.cluster.datastore.compat.LegacyDOMStoreAdapter; import org.opendaylight.controller.config.api.DependencyResolver; import org.opendaylight.controller.config.api.ModuleIdentifier; import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.osgi.framework.BundleContext; +@Deprecated public class DistributedOperationalDataStoreProviderModule extends AbstractDistributedOperationalDataStoreProviderModule { private BundleContext bundleContext; @@ -48,7 +50,12 @@ public class DistributedOperationalDataStoreProviderModule WaitingServiceTracker tracker = WaitingServiceTracker.create( DistributedDataStoreInterface.class, bundleContext, "(type=distributed-operational)"); DistributedDataStoreInterface delegate = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES); - return new ForwardingDistributedDataStore(delegate, tracker); + return new LegacyDOMStoreAdapter(delegate) { + @Override + public void close() { + tracker.close(); + } + }; } public static DatastoreContext newDatastoreContext() { @@ -96,9 +103,12 @@ public class DistributedOperationalDataStoreProviderModule props.getShardCommitQueueExpiryTimeoutInSeconds().getValue().intValue()) .transactionDebugContextEnabled(props.getTransactionDebugContextEnabled()) .customRaftPolicyImplementation(props.getCustomRaftPolicyImplementation()) - .shardSnapshotChunkSize(props.getShardSnapshotChunkSize().getValue().intValue()) + .maximumMessageSliceSize(props.getMaximumMessageSliceSize().getValue().intValue()) .useTellBasedProtocol(props.getUseTellBasedProtocol()) .syncIndexThreshold(props.getSyncIndexThreshold().getValue()) + .backendAlivenessTimerIntervalInSeconds(props.getBackendAlivenessTimerIntervalInSeconds().getValue()) + .frontendRequestTimeoutInSeconds(props.getFrontendRequestTimeoutInSeconds().getValue()) + .frontendNoProgressTimeoutInSeconds(props.getFrontendNoProgressTimeoutInSeconds().getValue()) .build(); }