rdev/gossip-revisited
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP on configurable cluster names

Browse Source
This commit is contained in:
P. Taylor Goetz
2016-04-26 17:08:56 -04:00
parent bea44ea12e
commit 723c0a050b
13 changed files with 71 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/java/io/teknek/gossip/ShutdownDeadtimeTest.java
View File

@ -23,6 +23,7 @@ import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import java.util.UUID;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
@ -44,12 +45,13 @@ public class ShutdownDeadtimeTest {
//@Ignore
public void DeadNodesDoNotComeAliveAgain() throws InterruptedException, UnknownHostException {
GossipSettings settings = new GossipSettings(1000, 10000);
String cluster = UUID.randomUUID().toString();
log.info( "Adding seed nodes" );
int seedNodes = 3;
List<GossipMember> startupMembers = new ArrayList<>();
for (int i = 1; i < seedNodes + 1; ++i) {
startupMembers.add(new RemoteGossipMember("127.0.0.1", 50000 + i, i + ""));
startupMembers.add(new RemoteGossipMember(cluster, "127.0.0.1", 50000 + i, i + ""));
}
log.info( "Adding clients" );
@ -57,7 +59,7 @@ public class ShutdownDeadtimeTest {
final int clusterMembers = 5;
for (int i = 1; i < clusterMembers+1; ++i) {
final int j = i;
GossipService gossipService = new GossipService("127.0.0.1", 50000 + i, i + "",
GossipService gossipService = new GossipService(cluster, "127.0.0.1", 50000 + i, i + "",
startupMembers, settings,
new GossipListener(){
@Override
@ -104,7 +106,7 @@ public class ShutdownDeadtimeTest {
}}).afterWaitingAtMost(10, TimeUnit.SECONDS).isEqualTo(4);
// start client again
GossipService gossipService = new GossipService("127.0.0.1", shutdownPort, shutdownId + "",
GossipService gossipService = new GossipService(cluster, "127.0.0.1", shutdownPort, shutdownId + "",
startupMembers, settings,
new GossipListener(){
@Override

6
src/test/java/io/teknek/gossip/StartupSettingsTest.java
View File

@ -44,6 +44,7 @@ import static org.junit.Assert.assertTrue;
*/
public class StartupSettingsTest {
private static final Logger log = Logger.getLogger( StartupSettingsTest.class );
private static final String CLUSTER = UUID.randomUUID().toString();
@Test
public void testUsingSettingsFile() throws IOException, InterruptedException, JSONException {
@ -52,7 +53,7 @@ public class StartupSettingsTest {
settingsFile.deleteOnExit();
writeSettingsFile(settingsFile);
final GossipService firstService = new GossipService(
"127.0.0.1", 50000, UUID.randomUUID().toString(),
CLUSTER, "127.0.0.1", 50000, UUID.randomUUID().toString(),
new ArrayList<GossipMember>(), new GossipSettings(), null);
firstService.start();
@ -76,12 +77,13 @@ public class StartupSettingsTest {
private void writeSettingsFile( File target ) throws IOException {
String settings =
"[{\n" + // It is odd that this is meant to be in an array, but oh well.
" \"cluster\":\"" + CLUSTER + "\",\n" +
" \"id\":\"" + UUID.randomUUID() + "\",\n" +
" \"port\":50001,\n" +
" \"gossip_interval\":1000,\n" +
" \"cleanup_interval\":10000,\n" +
" \"members\":[\n" +
" {\"host\":\"127.0.0.1\", \"port\":50000}\n" +
" {\"cluster\": \"" + CLUSTER + "\",\"host\":\"127.0.0.1\", \"port\":50000}\n" +
" ]\n" +
"}]";

6
src/test/java/io/teknek/gossip/TenNodeThreeSeedTest.java
View File

@ -22,6 +22,7 @@ import io.teknek.tunit.TUnit;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
@ -52,19 +53,20 @@ public class TenNodeThreeSeedTest {
public void abc() throws InterruptedException, UnknownHostException{
GossipSettings settings = new GossipSettings();
String cluster = UUID.randomUUID().toString();
log.info( "Adding seed nodes" );
int seedNodes = 3;
List<GossipMember> startupMembers = new ArrayList<>();
for (int i = 1; i < seedNodes+1; ++i) {
startupMembers.add(new RemoteGossipMember("127.0.0.1", 50000 + i, i + ""));
startupMembers.add(new RemoteGossipMember(cluster, "127.0.0.1", 50000 + i, i + ""));
}
log.info( "Adding clients" );
final List<GossipService> clients = new ArrayList<>();
final int clusterMembers = 5;
for (int i = 1; i < clusterMembers+1; ++i) {
GossipService gossipService = new GossipService("127.0.0.1", 50000 + i, i + "",
GossipService gossipService = new GossipService(cluster, "127.0.0.1", 50000 + i, i + "",
startupMembers, settings,
new GossipListener(){
@Override