From 14dc4d012d17a15d57c2a476abb747f46a512258 Mon Sep 17 00:00:00 2001 From: tom Date: Fri, 26 Sep 2014 12:43:14 -0700 Subject: [PATCH 1/2] Working on IO loop tests commands. --- apps/foo/pom.xml | 4 ++++ .../java/org/onlab/onos/foo/IOLoopTestClient.java | 12 ++---------- .../java/org/onlab/onos/foo/IOLoopTestServer.java | 10 +--------- .../org/onlab/onos/foo/TestIOClientCommand.java | 4 ++-- pom.xml | 6 ++++++ .../test/java/org/onlab/nio/IOLoopTestClient.java | 13 ++----------- .../test/java/org/onlab/nio/IOLoopTestServer.java | 10 +--------- 7 files changed, 18 insertions(+), 41 deletions(-) diff --git a/apps/foo/pom.xml b/apps/foo/pom.xml index 868b99200d..860d70bba8 100644 --- a/apps/foo/pom.xml +++ b/apps/foo/pom.xml @@ -27,6 +27,10 @@ onlab-nio ${project.version} + + org.livetribe.slp + livetribe-slp + org.apache.karaf.shell org.apache.karaf.shell.console diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/IOLoopTestClient.java b/apps/foo/src/main/java/org/onlab/onos/foo/IOLoopTestClient.java index 5c96d497f7..3ec8c07044 100644 --- a/apps/foo/src/main/java/org/onlab/onos/foo/IOLoopTestClient.java +++ b/apps/foo/src/main/java/org/onlab/onos/foo/IOLoopTestClient.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import static java.lang.String.format; -import static java.lang.System.currentTimeMillis; import static java.lang.System.nanoTime; import static java.lang.System.out; import static org.onlab.onos.foo.IOLoopTestServer.PORT; @@ -82,7 +81,7 @@ public class IOLoopTestClient { int wc = args.length > 1 ? Integer.parseInt(args[1]) : 6; int mc = args.length > 2 ? Integer.parseInt(args[2]) : 50 * 1000000; int ml = args.length > 3 ? Integer.parseInt(args[3]) : 128; - int to = args.length > 4 ? Integer.parseInt(args[4]) : 30; + int to = args.length > 4 ? Integer.parseInt(args[4]) : 60; log.info("Setting up client with {} workers sending {} {}-byte messages to {} server... ", wc, mc, ml, ip); @@ -186,7 +185,7 @@ public class IOLoopTestClient { */ public void report() { DecimalFormat f = new DecimalFormat("#,##0"); - out.println(format("Client: %s messages; %s bytes; %s mps; %s Mbs; %s ns latency", + out.println(format("Client: %s messages; %s bytes; %s mps; %s MBs; %s ns latency", f.format(messages.total()), f.format(bytes.total()), f.format(messages.throughput()), f.format(bytes.throughput() / (1024 * msgLength)), @@ -218,13 +217,6 @@ public class IOLoopTestClient { messages.add(stream.messagesIn().total()); bytes.add(stream.bytesIn().total()); - -// out.println(format("Disconnected client; inbound %s mps, %s Mbps; outbound %s mps, %s Mbps", -// FORMAT.format(stream.messagesIn().throughput()), -// FORMAT.format(stream.bytesIn().throughput() / (1024 * msgLength)), -// FORMAT.format(stream.messagesOut().throughput()), -// FORMAT.format(stream.bytesOut().throughput() / (1024 * msgLength)))); - stream.messagesOut().reset(); stream.bytesOut().reset(); } diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/IOLoopTestServer.java b/apps/foo/src/main/java/org/onlab/onos/foo/IOLoopTestServer.java index ad7e6b8108..12cd2731c2 100644 --- a/apps/foo/src/main/java/org/onlab/onos/foo/IOLoopTestServer.java +++ b/apps/foo/src/main/java/org/onlab/onos/foo/IOLoopTestServer.java @@ -23,7 +23,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import static java.lang.String.format; -import static java.lang.System.currentTimeMillis; import static java.lang.System.nanoTime; import static java.lang.System.out; import static org.onlab.util.Tools.delay; @@ -157,7 +156,7 @@ public class IOLoopTestServer { */ public void report() { DecimalFormat f = new DecimalFormat("#,##0"); - out.println(format("Server: %s messages; %s bytes; %s mps; %s Mbs", + out.println(format("Server: %s messages; %s bytes; %s mps; %s MBs", f.format(messages.total()), f.format(bytes.total()), f.format(messages.throughput()), f.format(bytes.throughput() / (1024 * msgLength)))); @@ -197,15 +196,8 @@ public class IOLoopTestServer { @Override protected void removeStream(MessageStream stream) { super.removeStream(stream); - messages.add(stream.messagesIn().total()); bytes.add(stream.bytesIn().total()); - -// out.println(format("Disconnected server; inbound %s mps, %s Mbps; outbound %s mps, %s Mbps", -// FORMAT.format(stream.messagesIn().throughput()), -// FORMAT.format(stream.bytesIn().throughput() / (1024 * msgLength)), -// FORMAT.format(stream.messagesOut().throughput()), -// FORMAT.format(stream.bytesOut().throughput() / (1024 * msgLength)))); } @Override diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/TestIOClientCommand.java b/apps/foo/src/main/java/org/onlab/onos/foo/TestIOClientCommand.java index 612d32015a..b48fe53e63 100644 --- a/apps/foo/src/main/java/org/onlab/onos/foo/TestIOClientCommand.java +++ b/apps/foo/src/main/java/org/onlab/onos/foo/TestIOClientCommand.java @@ -23,7 +23,7 @@ public class TestIOClientCommand extends AbstractShellCommand { @Argument(index = 2, name = "messageCount", description = "Message count", required = false, multiValued = false) - String messageCount = "10000000"; + String messageCount = "1000000"; @Argument(index = 3, name = "messageLength", description = "Message length (bytes)", required = false, multiValued = false) @@ -31,7 +31,7 @@ public class TestIOClientCommand extends AbstractShellCommand { @Argument(index = 4, name = "timeoutSecs", description = "Test timeout (seconds)", required = false, multiValued = false) - String timeoutSecs = "30"; + String timeoutSecs = "60"; @Override protected void execute() { diff --git a/pom.xml b/pom.xml index 26e555ed86..b98a9e5b97 100644 --- a/pom.xml +++ b/pom.xml @@ -133,6 +133,12 @@ provided + + org.livetribe.slp + livetribe-slp + 2.2.1 + + com.hazelcast hazelcast diff --git a/utils/nio/src/test/java/org/onlab/nio/IOLoopTestClient.java b/utils/nio/src/test/java/org/onlab/nio/IOLoopTestClient.java index dba0b18007..bdcc97a00f 100644 --- a/utils/nio/src/test/java/org/onlab/nio/IOLoopTestClient.java +++ b/utils/nio/src/test/java/org/onlab/nio/IOLoopTestClient.java @@ -24,7 +24,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import static java.lang.String.format; -import static java.lang.System.currentTimeMillis; import static java.lang.System.nanoTime; import static java.lang.System.out; import static org.onlab.nio.IOLoopTestServer.PORT; @@ -80,7 +79,7 @@ public class IOLoopTestClient { int wc = args.length > 1 ? Integer.parseInt(args[1]) : 6; int mc = args.length > 2 ? Integer.parseInt(args[2]) : 50 * 1000000; int ml = args.length > 3 ? Integer.parseInt(args[3]) : 128; - int to = args.length > 4 ? Integer.parseInt(args[4]) : 30; + int to = args.length > 4 ? Integer.parseInt(args[4]) : 60; log.info("Setting up client with {} workers sending {} {}-byte messages to {} server... ", wc, mc, ml, ip); @@ -184,7 +183,7 @@ public class IOLoopTestClient { */ public void report() { DecimalFormat f = new DecimalFormat("#,##0"); - out.println(format("Client: %s messages; %s bytes; %s mps; %s Mbs; %s ns latency", + out.println(format("Client: %s messages; %s bytes; %s mps; %s MBs; %s ns latency", f.format(messages.total()), f.format(bytes.total()), f.format(messages.throughput()), f.format(bytes.throughput() / (1024 * msgLength)), @@ -213,16 +212,8 @@ public class IOLoopTestClient { @Override protected synchronized void removeStream(MessageStream stream) { super.removeStream(stream); - messages.add(stream.messagesIn().total()); bytes.add(stream.bytesIn().total()); - -// out.println(format("Disconnected client; inbound %s mps, %s Mbps; outbound %s mps, %s Mbps", -// FORMAT.format(stream.messagesIn().throughput()), -// FORMAT.format(stream.bytesIn().throughput() / (1024 * msgLength)), -// FORMAT.format(stream.messagesOut().throughput()), -// FORMAT.format(stream.bytesOut().throughput() / (1024 * msgLength)))); - stream.messagesOut().reset(); stream.bytesOut().reset(); } diff --git a/utils/nio/src/test/java/org/onlab/nio/IOLoopTestServer.java b/utils/nio/src/test/java/org/onlab/nio/IOLoopTestServer.java index 457023bb8c..a295c86684 100644 --- a/utils/nio/src/test/java/org/onlab/nio/IOLoopTestServer.java +++ b/utils/nio/src/test/java/org/onlab/nio/IOLoopTestServer.java @@ -20,7 +20,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import static java.lang.String.format; -import static java.lang.System.currentTimeMillis; import static java.lang.System.out; import static org.onlab.util.Tools.delay; import static org.onlab.util.Tools.namedThreads; @@ -153,7 +152,7 @@ public class IOLoopTestServer { */ public void report() { DecimalFormat f = new DecimalFormat("#,##0"); - out.println(format("Server: %s messages; %s bytes; %s mps; %s Mbs", + out.println(format("Server: %s messages; %s bytes; %s mps; %s MBs", f.format(messages.total()), f.format(bytes.total()), f.format(messages.throughput()), f.format(bytes.throughput() / (1024 * msgLength)))); @@ -193,15 +192,8 @@ public class IOLoopTestServer { @Override protected void removeStream(MessageStream stream) { super.removeStream(stream); - messages.add(stream.messagesIn().total()); bytes.add(stream.bytesIn().total()); - -// out.println(format("Disconnected server; inbound %s mps, %s Mbps; outbound %s mps, %s Mbps", -// FORMAT.format(stream.messagesIn().throughput()), -// FORMAT.format(stream.bytesIn().throughput() / (1024 * msgLength)), -// FORMAT.format(stream.messagesOut().throughput()), -// FORMAT.format(stream.bytesOut().throughput() / (1024 * msgLength)))); } @Override From 22e0f2f946cbc4573810ee1995f0a1f49ef6872b Mon Sep 17 00:00:00 2001 From: Yuta HIGUCHI Date: Fri, 26 Sep 2014 16:30:53 -0700 Subject: [PATCH 2/2] MastershipTerm should be immutable Change-Id: Ifc7484caa80fa21b2b4594389dec5c4d0c112c0f --- .../src/main/java/org/onlab/onos/cluster/MastershipTerm.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/api/src/main/java/org/onlab/onos/cluster/MastershipTerm.java b/core/api/src/main/java/org/onlab/onos/cluster/MastershipTerm.java index f015ae5505..71d08f2656 100644 --- a/core/api/src/main/java/org/onlab/onos/cluster/MastershipTerm.java +++ b/core/api/src/main/java/org/onlab/onos/cluster/MastershipTerm.java @@ -5,7 +5,7 @@ import java.util.Objects; public final class MastershipTerm { private final NodeId master; - private int termNumber; + private final int termNumber; private MastershipTerm(NodeId master, int term) { this.master = master;