홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
tom
43e836a3 1 parent c9b33d1e

Further simplified the store & connection manager relationship.

Inline Side-by-side
Showing 6 changed files with 14 additions and 6 deletions
...@@ -13,7 +13,6 @@ import org.onlab.onos.cluster.DefaultControllerNode; ...@@ -13,7 +13,6 @@ import org.onlab.onos.cluster.DefaultControllerNode;
13 import org.onlab.onos.cluster.NodeId; 13 import org.onlab.onos.cluster.NodeId;
14 import org.onlab.onos.store.cluster.messaging.ClusterCommunicationService; 14 import org.onlab.onos.store.cluster.messaging.ClusterCommunicationService;
15 import org.onlab.onos.store.cluster.messaging.ClusterMessage; 15 import org.onlab.onos.store.cluster.messaging.ClusterMessage;
16 -import org.onlab.onos.store.cluster.messaging.ClusterMessageStream;
17 import org.onlab.onos.store.cluster.messaging.HelloMessage; 16 import org.onlab.onos.store.cluster.messaging.HelloMessage;
18 import org.onlab.onos.store.cluster.messaging.MessageSubject; 17 import org.onlab.onos.store.cluster.messaging.MessageSubject;
19 import org.onlab.onos.store.cluster.messaging.MessageSubscriber; 18 import org.onlab.onos.store.cluster.messaging.MessageSubscriber;
...@@ -50,8 +49,8 @@ public class ClusterCommunicationManager ...@@ -50,8 +49,8 @@ public class ClusterCommunicationManager
50 49
51 private final Logger log = LoggerFactory.getLogger(getClass()); 50 private final Logger log = LoggerFactory.getLogger(getClass());
52 51
53 - private static final long CONNECTION_CUSTODIAN_DELAY = 1000L; 52 + private static final long CONNECTION_CUSTODIAN_DELAY = 100L;
54 - private static final long CONNECTION_CUSTODIAN_FREQUENCY = 5000; 53 + private static final long CONNECTION_CUSTODIAN_FREQUENCY = 2000;
55 54
56 private static final long START_TIMEOUT = 1000; 55 private static final long START_TIMEOUT = 1000;
57 private static final int WORKERS = 3; 56 private static final int WORKERS = 3;
......
...@@ -5,7 +5,6 @@ import org.onlab.nio.MessageStream; ...@@ -5,7 +5,6 @@ import org.onlab.nio.MessageStream;
5 import org.onlab.onos.cluster.DefaultControllerNode; 5 import org.onlab.onos.cluster.DefaultControllerNode;
6 import org.onlab.onos.cluster.NodeId; 6 import org.onlab.onos.cluster.NodeId;
7 import org.onlab.onos.store.cluster.messaging.ClusterMessage; 7 import org.onlab.onos.store.cluster.messaging.ClusterMessage;
8 -import org.onlab.onos.store.cluster.messaging.ClusterMessageStream;
9 import org.onlab.onos.store.cluster.messaging.HelloMessage; 8 import org.onlab.onos.store.cluster.messaging.HelloMessage;
10 import org.onlab.onos.store.cluster.messaging.SerializationService; 9 import org.onlab.onos.store.cluster.messaging.SerializationService;
11 import org.slf4j.Logger; 10 import org.slf4j.Logger;
......
1 -package org.onlab.onos.store.cluster.messaging; 1 +package org.onlab.onos.store.cluster.impl;
2 2
3 import org.onlab.nio.IOLoop; 3 import org.onlab.nio.IOLoop;
4 import org.onlab.nio.MessageStream; 4 import org.onlab.nio.MessageStream;
5 import org.onlab.onos.cluster.DefaultControllerNode; 5 import org.onlab.onos.cluster.DefaultControllerNode;
6 +import org.onlab.onos.store.cluster.messaging.ClusterMessage;
7 +import org.onlab.onos.store.cluster.messaging.SerializationService;
6 8
7 import java.nio.ByteBuffer; 9 import java.nio.ByteBuffer;
8 import java.nio.channels.ByteChannel; 10 import java.nio.channels.ByteChannel;
......
1 -package org.onlab.onos.store.cluster.messaging.impl; 1 +package org.onlab.onos.store.cluster.impl;
2 2
3 import org.apache.felix.scr.annotations.Component; 3 import org.apache.felix.scr.annotations.Component;
4 import org.apache.felix.scr.annotations.Service; 4 import org.apache.felix.scr.annotations.Service;
......
1 +/**
2 + * Distributed cluster store and messaging subsystem implementation.
3 + */
4 +package org.onlab.onos.store.cluster.impl;
...\ No newline at end of file ...\ No newline at end of file
1 +/**
2 + * Cluster messaging APIs for the use by the various distributed stores.
3 + */
4 +package org.onlab.onos.store.cluster.messaging;
...\ No newline at end of file ...\ No newline at end of file