Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix issues with LeastLoadedCandidateSelectionStrategy
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
DatastoreContext.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContext.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContext.java
index cb65d5f7e1ea94987a0d0685802e9d7843a838f4..9f2103f5e1a8c20b255101b967d0a0a166f137f0 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContext.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContext.java
@@
-53,7
+53,7
@@
public class DatastoreContext {
public static final long DEFAULT_SHARD_COMMIT_QUEUE_EXPIRY_TIMEOUT_IN_MS = TimeUnit.MILLISECONDS.convert(2, TimeUnit.MINUTES);
public static final int DEFAULT_SHARD_SNAPSHOT_CHUNK_SIZE = 2048000;
public static final long DEFAULT_SHARD_COMMIT_QUEUE_EXPIRY_TIMEOUT_IN_MS = TimeUnit.MILLISECONDS.convert(2, TimeUnit.MINUTES);
public static final int DEFAULT_SHARD_SNAPSHOT_CHUNK_SIZE = 2048000;
- private static final Set<String> globalDatastore
Typ
es = Sets.newConcurrentHashSet();
+ private static final Set<String> globalDatastore
Nam
es = Sets.newConcurrentHashSet();
private InMemoryDOMDataStoreConfigProperties dataStoreProperties;
private Duration shardTransactionIdleTimeout = DatastoreContext.DEFAULT_SHARD_TRANSACTION_IDLE_TIMEOUT;
private InMemoryDOMDataStoreConfigProperties dataStoreProperties;
private Duration shardTransactionIdleTimeout = DatastoreContext.DEFAULT_SHARD_TRANSACTION_IDLE_TIMEOUT;
@@
-75,8
+75,8
@@
public class DatastoreContext {
private boolean transactionDebugContextEnabled = false;
private String shardManagerPersistenceId;
private boolean transactionDebugContextEnabled = false;
private String shardManagerPersistenceId;
- public static Set<String> getGlobalDatastore
Typ
es() {
- return globalDatastore
Typ
es;
+ public static Set<String> getGlobalDatastore
Nam
es() {
+ return globalDatastore
Nam
es;
}
private DatastoreContext() {
}
private DatastoreContext() {
@@
-184,14
+184,6
@@
public class DatastoreContext {
return logicalStoreType;
}
return logicalStoreType;
}
- /**
- * @deprecated Use {@link #getDataStoreName()} or {@link #getLogicalStoreType()} instead.
- */
- @Deprecated
- public String getDataStoreType(){
- return getDataStoreName();
- }
-
public long getTransactionCreationInitialRateLimit() {
return transactionCreationInitialRateLimit;
}
public long getTransactionCreationInitialRateLimit() {
return transactionCreationInitialRateLimit;
}
@@
-393,14
+385,6
@@
public class DatastoreContext {
return this;
}
return this;
}
- /**
- * @deprecated Use {@link #logicalStoreType(LogicalDatastoreType)} or {@link #dataStoreName(String)}.
- */
- @Deprecated
- public Builder dataStoreType(String dataStoreType){
- return dataStoreName(dataStoreType);
- }
-
public Builder logicalStoreType(LogicalDatastoreType logicalStoreType){
datastoreContext.logicalStoreType = Preconditions.checkNotNull(logicalStoreType);
public Builder logicalStoreType(LogicalDatastoreType logicalStoreType){
datastoreContext.logicalStoreType = Preconditions.checkNotNull(logicalStoreType);
@@
-486,7
+470,7
@@
public class DatastoreContext {
maxShardDataChangeListenerQueueSize, maxShardDataStoreExecutorQueueSize);
if(datastoreContext.dataStoreName != null) {
maxShardDataChangeListenerQueueSize, maxShardDataStoreExecutorQueueSize);
if(datastoreContext.dataStoreName != null) {
- globalDatastore
Typ
es.add(datastoreContext.dataStoreName);
+ globalDatastore
Nam
es.add(datastoreContext.dataStoreName);
}
return datastoreContext;
}
return datastoreContext;