Trivial logging change
Change-Id: I8166b5cb886c16b30ad28886a000525ab2059943
Enabling Raft based device mastership store
Change-Id: Ide4dc559aa241ec2f3fa587701f6f32ba6856218
diff --git a/core/store/dist/src/main/java/org/onosproject/store/mastership/impl/ConsistentDeviceMastershipStore.java b/core/store/dist/src/main/java/org/onosproject/store/mastership/impl/ConsistentDeviceMastershipStore.java
index bc31e08..5606c60 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/mastership/impl/ConsistentDeviceMastershipStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/mastership/impl/ConsistentDeviceMastershipStore.java
@@ -69,7 +69,7 @@
/**
* Implementation of the MastershipStore on top of Leadership Service.
*/
-@Component(immediate = true, enabled = false)
+@Component(immediate = true, enabled = true)
@Service
public class ConsistentDeviceMastershipStore
extends AbstractStore<MastershipEvent, MastershipStoreDelegate>
@@ -95,9 +95,8 @@
new MessageSubject("mastership-store-device-role-relinquish");
private static final Pattern DEVICE_MASTERSHIP_TOPIC_PATTERN =
- Pattern.compile("/devices/(.*)/mastership");
+ Pattern.compile("device:(.*)");
- private static final long PEER_REQUEST_TIMEOUT_MS = 5000;
private ExecutorService messageHandlingExecutor;
private final LeadershipEventListener leadershipEventListener =
new InternalDeviceMastershipEventListener();
@@ -345,7 +344,7 @@
}
private String createDeviceMastershipTopic(DeviceId deviceId) {
- return "/devices/" + deviceId.toString() + "/mastership";
+ return String.format("device:%s", deviceId.toString());
}
private DeviceId extractDeviceIdFromTopic(String topic) {