홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Madan Jampani
Committed by Gerrit Code Review
248e87b1 1 parent d3bcef38

Turning on Phi accrual failure detector based ClusterService implementation 

Change-Id: Ica4fd054c247d10bef801c05bccf931147a9a732
Inline Side-by-side
Showing 2 changed files with 9 additions and 9 deletions
...@@ -15,12 +15,19 @@ ...@@ -15,12 +15,19 @@
15 */ 15 */
16 package org.onosproject.cluster.impl; 16 package org.onosproject.cluster.impl;
17 17
18 +import static com.google.common.base.Preconditions.checkArgument;
19 +import static com.google.common.base.Preconditions.checkNotNull;
20 +import static org.slf4j.LoggerFactory.getLogger;
21 +
22 +import java.util.Set;
23 +
18 import org.apache.felix.scr.annotations.Activate; 24 import org.apache.felix.scr.annotations.Activate;
19 import org.apache.felix.scr.annotations.Component; 25 import org.apache.felix.scr.annotations.Component;
20 import org.apache.felix.scr.annotations.Deactivate; 26 import org.apache.felix.scr.annotations.Deactivate;
21 import org.apache.felix.scr.annotations.Reference; 27 import org.apache.felix.scr.annotations.Reference;
22 import org.apache.felix.scr.annotations.ReferenceCardinality; 28 import org.apache.felix.scr.annotations.ReferenceCardinality;
23 import org.apache.felix.scr.annotations.Service; 29 import org.apache.felix.scr.annotations.Service;
30 +import org.onlab.packet.IpAddress;
24 import org.onosproject.cluster.ClusterAdminService; 31 import org.onosproject.cluster.ClusterAdminService;
25 import org.onosproject.cluster.ClusterEvent; 32 import org.onosproject.cluster.ClusterEvent;
26 import org.onosproject.cluster.ClusterEventListener; 33 import org.onosproject.cluster.ClusterEventListener;
...@@ -31,19 +38,12 @@ import org.onosproject.cluster.ControllerNode; ...@@ -31,19 +38,12 @@ import org.onosproject.cluster.ControllerNode;
31 import org.onosproject.cluster.NodeId; 38 import org.onosproject.cluster.NodeId;
32 import org.onosproject.event.AbstractListenerRegistry; 39 import org.onosproject.event.AbstractListenerRegistry;
33 import org.onosproject.event.EventDeliveryService; 40 import org.onosproject.event.EventDeliveryService;
34 -import org.onlab.packet.IpAddress;
35 import org.slf4j.Logger; 41 import org.slf4j.Logger;
36 42
37 -import java.util.Set;
38 -
39 -import static com.google.common.base.Preconditions.checkArgument;
40 -import static com.google.common.base.Preconditions.checkNotNull;
41 -import static org.slf4j.LoggerFactory.getLogger;
42 -
43 /** 43 /**
44 * Implementation of the cluster service. 44 * Implementation of the cluster service.
45 */ 45 */
46 -@Component(immediate = true) 46 +@Component(immediate = true, enabled = false)
47 @Service 47 @Service
48 public class ClusterManager implements ClusterService, ClusterAdminService { 48 public class ClusterManager implements ClusterService, ClusterAdminService {
49 49
......
...@@ -69,7 +69,7 @@ import static com.google.common.base.Preconditions.checkArgument; ...@@ -69,7 +69,7 @@ import static com.google.common.base.Preconditions.checkArgument;
69 * ClusterService implementation that employs an accrual failure 69 * ClusterService implementation that employs an accrual failure
70 * detector to identify cluster member up/down status. 70 * detector to identify cluster member up/down status.
71 */ 71 */
72 -@Component(immediate = true, enabled = false) 72 +@Component(immediate = true, enabled = true)
73 @Service 73 @Service
74 public class ClusterManager implements ClusterService, ClusterAdminService { 74 public class ClusterManager implements ClusterService, ClusterAdminService {
75 75
......