Fix race condition between AtomixManager and metadata providers startup
Change-Id: I4799c079455e0e5c79a800ba3108b4c9eedbe1b2
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/atomix/ClusterActivator.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/ClusterActivator.java
new file mode 100644
index 0000000..125ceab
--- /dev/null
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/ClusterActivator.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2018-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.store.atomix;
+
+import org.onosproject.component.ComponentService;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.slf4j.Logger;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+@Component(immediate = true, service = ClusterActivator.class)
+public class ClusterActivator {
+ private final Logger log = getLogger(getClass());
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ private ComponentService componentService;
+
+ @Activate
+ public void activate() {
+ log.info("Started");
+ }
+
+ /**
+ * Resources needed by the cluster are now available and the Atomix
+ * cluster can be formed.
+ */
+ public void activateCluster() {
+ componentService.activate(null, "org.onosproject.store.atomix.impl.AtomixManager");
+ }
+}
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/atomix/impl/AtomixManager.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/impl/AtomixManager.java
index 8e6b9c0..1135fda 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/atomix/impl/AtomixManager.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/impl/AtomixManager.java
@@ -36,7 +36,7 @@
/**
* Atomix manager.
*/
-@Component(immediate = true, service = AtomixManager.class)
+@Component(immediate = true, enabled = false, service = AtomixManager.class)
public class AtomixManager {
private static final String LOCAL_DATA_DIR = System.getProperty("karaf.data") + "/db/partitions/";
private final Logger log = LoggerFactory.getLogger(getClass());
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/atomix/package-info.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/package-info.java
new file mode 100644
index 0000000..5613aa7
--- /dev/null
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2014-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Subsystem for tracking controller cluster nodes.
+ */
+package org.onosproject.store.atomix;