Bugfixes for DistributedLockManager functionality
Added a method called broadcastIncludeSelf to ClusterCommunicationService.
Cosmetic improvements: added toString methods
Change-Id: I1d58720c29e6f8642f950670c3a6d95a7019a491
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseStateMachine.java b/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseStateMachine.java
index 3b0d874..cdf66af 100644
--- a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseStateMachine.java
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseStateMachine.java
@@ -30,6 +30,7 @@
import org.onlab.util.KryoNamespace;
import org.slf4j.Logger;
+import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -65,6 +66,7 @@
.register(WriteStatus.class)
// TODO: Move this out ?
.register(TableModificationEvent.class)
+ .register(TableModificationEvent.Type.class)
.register(ClusterMessagingProtocol.COMMON)
.build()
.populate(1);
@@ -85,7 +87,8 @@
}
@Command
- public boolean createTable(String tableName, int ttlMillis) {
+ public boolean createTableWithExpiration(String tableName) {
+ int ttlMillis = 10000;
TableMetadata metadata = new TableMetadata(tableName, ttlMillis);
return createTable(metadata);
}
@@ -266,6 +269,7 @@
// notify listeners of table mod events.
for (DatabaseUpdateEventListener listener : listeners) {
for (TableModificationEvent tableModificationEvent : tableModificationEvents) {
+ log.info("Publishing table modification event: {}", tableModificationEvent);
listener.tableModified(tableModificationEvent);
}
}
@@ -345,6 +349,15 @@
public int ttlMillis() {
return ttlMillis;
}
+
+ @Override
+ public String toString() {
+ return MoreObjects.toStringHelper(getClass())
+ .add("tableName", tableName)
+ .add("expireOldEntries", expireOldEntries)
+ .add("ttlMillis", ttlMillis)
+ .toString();
+ }
}
@Override