From 623bc331d0d1019c6355b1e4d397b5bd07a125ac Mon Sep 17 00:00:00 2001 From: Rick Carback <rick@privategrity.com> Date: Tue, 6 Mar 2018 20:26:25 +0000 Subject: [PATCH] Final form of the initial integration test sans gold output This runs 4 clients, each sends a message to client id % 4 + 1. --- basice2e/run.sh | 10 +++++++--- basice2e/server-1.yaml | 2 +- basice2e/server-2.yaml | 2 +- basice2e/server-3.yaml | 2 +- basice2e/server-4.yaml | 2 +- basice2e/server-5.yaml | 2 +- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/basice2e/run.sh b/basice2e/run.sh index fddc30d..8eb4a70 100755 --- a/basice2e/run.sh +++ b/basice2e/run.sh @@ -49,10 +49,14 @@ LASTNODE="localhost:50004" echo "STARTING CLIENTS..." CTR=0 -# for cid in 1 2 3 4; do -# for nid in 1 2 3 4; do -for cid in 1; do + +for cid in 1 2 3 4; do + # TODO: Change the recipients to send multiple messages. We can't + # run multiple clients with the same user id so we need + # updates to make that work. + # for nid in 1 2 3 4; do for nid in 1; do + nid=$((($cid % 4) + 1)) ../bin/client --numnodes 5 -s $LASTNODE -i $cid -d $nid -m "Hello, $nid" > results/client$cid$nid.out 2>&1 & RETVAL=$! echo "../bin/client -s $LASTNODE -i $cid -d $nid -m \"Hello, $nid\" -- $RETVAL" diff --git a/basice2e/server-1.yaml b/basice2e/server-1.yaml index 9d94ec8..418cddb 100644 --- a/basice2e/server-1.yaml +++ b/basice2e/server-1.yaml @@ -1,6 +1,6 @@ logPath: "results/server-1.log" verbose: "false" -batchSize: 1 +batchSize: 4 servers: - 50000 - 50001 diff --git a/basice2e/server-2.yaml b/basice2e/server-2.yaml index 64da89d..130b422 100644 --- a/basice2e/server-2.yaml +++ b/basice2e/server-2.yaml @@ -1,6 +1,6 @@ logPath: "results/server-2.log" verbose: "false" -batchSize: 1 +batchSize: 2 servers: - 50000 - 50001 diff --git a/basice2e/server-3.yaml b/basice2e/server-3.yaml index b449830..e63ad33 100644 --- a/basice2e/server-3.yaml +++ b/basice2e/server-3.yaml @@ -1,6 +1,6 @@ logPath: "results/server-3.log" verbose: "false" -batchSize: 1 +batchSize: 4 servers: - 50000 - 50001 diff --git a/basice2e/server-4.yaml b/basice2e/server-4.yaml index facb4de..1ef83e2 100644 --- a/basice2e/server-4.yaml +++ b/basice2e/server-4.yaml @@ -1,6 +1,6 @@ logPath: "results/server-4.log" verbose: "false" -batchSize: 1 +batchSize: 4 servers: - 50000 - 50001 diff --git a/basice2e/server-5.yaml b/basice2e/server-5.yaml index 5fa055e..e4a2e0c 100644 --- a/basice2e/server-5.yaml +++ b/basice2e/server-5.yaml @@ -1,6 +1,6 @@ logPath: "results/server-5.log" verbose: "false" -batchSize: 1 +batchSize: 4 servers: - 50000 - 50001 -- GitLab