import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import java.util.concurrent.TimeUnit;
-import org.opendaylight.controller.cluster.common.actor.CommonConfig;
import org.opendaylight.controller.cluster.datastore.ClusterWrapper;
import org.opendaylight.controller.cluster.datastore.Configuration;
+import org.opendaylight.controller.cluster.datastore.DataStoreVersions;
import org.opendaylight.controller.cluster.datastore.DatastoreContext;
import org.opendaylight.controller.cluster.datastore.exceptions.LocalShardNotFoundException;
import org.opendaylight.controller.cluster.datastore.exceptions.NoShardLeaderException;
private Timeout operationTimeout;
private final String selfAddressHostPort;
private TransactionRateLimiter txRateLimiter;
- private final int transactionOutstandingOperationLimit;
private Timeout transactionCommitOperationTimeout;
private Timeout shardInitializationTimeout;
private final Dispatchers dispatchers;
selfAddressHostPort = null;
}
- transactionOutstandingOperationLimit = new CommonConfig(this.getActorSystem().settings().config()).getMailBoxCapacity();
}
private void setCachedProperties() {
txRateLimiter = new TransactionRateLimiter(this);
- operationDuration = Duration.create(datastoreContext.getOperationTimeoutInSeconds(), TimeUnit.SECONDS);
+ operationDuration = Duration.create(datastoreContext.getOperationTimeoutInMillis(), TimeUnit.MILLISECONDS);
operationTimeout = new Timeout(operationDuration);
transactionCommitOperationTimeout = new Timeout(Duration.create(
public PrimaryShardInfo checkedApply(Object response) throws Exception {
if(response instanceof RemotePrimaryShardFound) {
LOG.debug("findPrimaryShardAsync received: {}", response);
- return onPrimaryShardFound(shardName, ((RemotePrimaryShardFound)response).getPrimaryPath(), null);
+ RemotePrimaryShardFound found = (RemotePrimaryShardFound)response;
+ return onPrimaryShardFound(shardName, found.getPrimaryPath(), found.getPrimaryVersion(), null);
} else if(response instanceof LocalPrimaryShardFound) {
LOG.debug("findPrimaryShardAsync received: {}", response);
LocalPrimaryShardFound found = (LocalPrimaryShardFound)response;
- return onPrimaryShardFound(shardName, found.getPrimaryPath(), found.getLocalShardDataTree());
+ return onPrimaryShardFound(shardName, found.getPrimaryPath(), DataStoreVersions.CURRENT_VERSION,
+ found.getLocalShardDataTree());
} else if(response instanceof NotInitializedException) {
throw (NotInitializedException)response;
} else if(response instanceof PrimaryNotFoundException) {
}
private PrimaryShardInfo onPrimaryShardFound(String shardName, String primaryActorPath,
- DataTree localShardDataTree) {
+ short primaryVersion, DataTree localShardDataTree) {
ActorSelection actorSelection = actorSystem.actorSelection(primaryActorPath);
- PrimaryShardInfo info = new PrimaryShardInfo(actorSelection, Optional.fromNullable(localShardDataTree));
+ PrimaryShardInfo info = new PrimaryShardInfo(actorSelection, primaryVersion,
+ Optional.fromNullable(localShardDataTree));
primaryShardInfoCache.putSuccessful(shardName, info);
return info;
}
return operationDuration;
}
+ public Timeout getOperationTimeout() {
+ return operationTimeout;
+ }
+
public boolean isPathLocal(String path) {
if (Strings.isNullOrEmpty(path)) {
return false;
return builder.toString();
}
- /**
- * Get the maximum number of operations that are to be permitted within a transaction before the transaction
- * should begin throttling the operations
- *
- * Parking reading this configuration here because we need to get to the actor system settings
- *
- * @return
- */
- public int getTransactionOutstandingOperationLimit(){
- return transactionOutstandingOperationLimit;
- }
-
/**
* This is a utility method that lets us get a Timer object for any operation. This is a little open-ended to allow
* us to create a timer for pretty much anything.