Further simplified the store & connection manager relationship.

This commit is contained in:
tom 2014-09-30 01:50:29 -07:00
parent c9b33d1ec5
commit 43e836a39f
6 changed files with 14 additions and 6 deletions

View File

@ -13,7 +13,6 @@ import org.onlab.onos.cluster.DefaultControllerNode;
import org.onlab.onos.cluster.NodeId; import org.onlab.onos.cluster.NodeId;
import org.onlab.onos.store.cluster.messaging.ClusterCommunicationService; import org.onlab.onos.store.cluster.messaging.ClusterCommunicationService;
import org.onlab.onos.store.cluster.messaging.ClusterMessage; import org.onlab.onos.store.cluster.messaging.ClusterMessage;
import org.onlab.onos.store.cluster.messaging.ClusterMessageStream;
import org.onlab.onos.store.cluster.messaging.HelloMessage; import org.onlab.onos.store.cluster.messaging.HelloMessage;
import org.onlab.onos.store.cluster.messaging.MessageSubject; import org.onlab.onos.store.cluster.messaging.MessageSubject;
import org.onlab.onos.store.cluster.messaging.MessageSubscriber; import org.onlab.onos.store.cluster.messaging.MessageSubscriber;
@ -50,8 +49,8 @@ public class ClusterCommunicationManager
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
private static final long CONNECTION_CUSTODIAN_DELAY = 1000L; private static final long CONNECTION_CUSTODIAN_DELAY = 100L;
private static final long CONNECTION_CUSTODIAN_FREQUENCY = 5000; private static final long CONNECTION_CUSTODIAN_FREQUENCY = 2000;
private static final long START_TIMEOUT = 1000; private static final long START_TIMEOUT = 1000;
private static final int WORKERS = 3; private static final int WORKERS = 3;

View File

@ -5,7 +5,6 @@ import org.onlab.nio.MessageStream;
import org.onlab.onos.cluster.DefaultControllerNode; import org.onlab.onos.cluster.DefaultControllerNode;
import org.onlab.onos.cluster.NodeId; import org.onlab.onos.cluster.NodeId;
import org.onlab.onos.store.cluster.messaging.ClusterMessage; import org.onlab.onos.store.cluster.messaging.ClusterMessage;
import org.onlab.onos.store.cluster.messaging.ClusterMessageStream;
import org.onlab.onos.store.cluster.messaging.HelloMessage; import org.onlab.onos.store.cluster.messaging.HelloMessage;
import org.onlab.onos.store.cluster.messaging.SerializationService; import org.onlab.onos.store.cluster.messaging.SerializationService;
import org.slf4j.Logger; import org.slf4j.Logger;

View File

@ -1,8 +1,10 @@
package org.onlab.onos.store.cluster.messaging; package org.onlab.onos.store.cluster.impl;
import org.onlab.nio.IOLoop; import org.onlab.nio.IOLoop;
import org.onlab.nio.MessageStream; import org.onlab.nio.MessageStream;
import org.onlab.onos.cluster.DefaultControllerNode; import org.onlab.onos.cluster.DefaultControllerNode;
import org.onlab.onos.store.cluster.messaging.ClusterMessage;
import org.onlab.onos.store.cluster.messaging.SerializationService;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.channels.ByteChannel; import java.nio.channels.ByteChannel;

View File

@ -1,4 +1,4 @@
package org.onlab.onos.store.cluster.messaging.impl; package org.onlab.onos.store.cluster.impl;
import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Service; import org.apache.felix.scr.annotations.Service;

View File

@ -0,0 +1,4 @@
/**
* Distributed cluster store and messaging subsystem implementation.
*/
package org.onlab.onos.store.cluster.impl;

View File

@ -0,0 +1,4 @@
/**
* Cluster messaging APIs for the use by the various distributed stores.
*/
package org.onlab.onos.store.cluster.messaging;