From 9b4660b4589f1366637a1bdf63341c29a0634997 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Thu, 12 Jan 2017 22:07:55 -0500 Subject: [PATCH 1/5] version bump to 0.8.0 --- version/version.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version/version.go b/version/version.go index 1d7245973..e0d7b4261 100644 --- a/version/version.go +++ b/version/version.go @@ -1,7 +1,7 @@ package version const Maj = "0" -const Min = "7" // tmsp useability (protobuf, unix); optimizations; broadcast_tx_commit -const Fix = "4" // --pex flag and less restricted /dial_seeds +const Min = "8" // validator set changes, tmsp->abci, app persistence/recovery, BFT-liveness fix +const Fix = "0" // const Version = Maj + "." + Min + "." + Fix From 1e25e9f58fdc577de82e451b3bd866f107b43b93 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Thu, 12 Jan 2017 22:49:52 -0500 Subject: [PATCH 2/5] glide update for go-db test fix --- glide.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glide.lock b/glide.lock index 6b39ae5b0..124b98cf0 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ hash: dcaf3fb1290b0d7942c86f0644a7431ac313247936eab9515b1ade9ffe579848 -updated: 2017-01-12T22:04:31.168997331-05:00 +updated: 2017-01-12T22:49:40.543108221-05:00 imports: - name: github.com/btcsuite/btcd version: 153dca5c1e4b5d1ea1523592495e5bedfa503391 @@ -73,7 +73,7 @@ imports: - name: github.com/tendermint/go-crypto version: 4b11d62bdb324027ea01554e5767b71174680ba0 - name: github.com/tendermint/go-db - version: 996c483f239954ab9abb49b09ad2c0f0014ac45e + version: 72f6dacd22a686cdf7fcd60286503e3aceda77ba - name: github.com/tendermint/go-events version: fddee66d90305fccb6f6d84d16c34fa65ea5b7f6 - name: github.com/tendermint/go-flowrate From ba7ca4f372eefc211349796faf6839f9d790422d Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Thu, 12 Jan 2017 23:11:38 -0500 Subject: [PATCH 3/5] fix tests --- test/p2p/kill_all/check_peers.sh | 2 +- test/test.sh | 2 ++ test/test_libs.sh | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/test/p2p/kill_all/check_peers.sh b/test/p2p/kill_all/check_peers.sh index 31f6d5504..3c9250790 100644 --- a/test/p2p/kill_all/check_peers.sh +++ b/test/p2p/kill_all/check_peers.sh @@ -4,7 +4,7 @@ set -eu NUM_OF_PEERS=$1 # how many attempts for each peer to catch up by height -MAX_ATTEMPTS_TO_CATCH_UP=10 +MAX_ATTEMPTS_TO_CATCH_UP=20 echo "Waiting for nodes to come online" set +e diff --git a/test/test.sh b/test/test.sh index dc50501e2..93908a8ba 100644 --- a/test/test.sh +++ b/test/test.sh @@ -10,6 +10,8 @@ bash ./test/docker/build.sh echo "" echo "* running go tests and app tests in docker container" +# sometimes its helpful to mount the local test folder +# -v $GOPATH/src/github.com/tendermint/tendermint/test:/go/src/github.com/tendermint/tendermint/test docker run --name run_test -t tester bash test/run_test.sh # copy the coverage results out of docker container diff --git a/test/test_libs.sh b/test/test_libs.sh index 164cdd340..8692f5de3 100644 --- a/test/test_libs.sh +++ b/test/test_libs.sh @@ -28,17 +28,20 @@ for lib in "${LIBS_GO_TEST[@]}"; do fi done +DIR=`pwd` for lib in "${LIBS_MAKE_TEST[@]}"; do # checkout vendored version of lib bash scripts/glide/checkout.sh $GLIDE $lib echo "Testing $lib ..." + cd $GOPATH/src/github.com/tendermint/$lib make test if [[ "$?" != 0 ]]; then echo "FAIL" exit 1 fi + cd $DIR done echo "" From 9123e63a3346e5b0edac7ffb08040821ac37150e Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Fri, 13 Jan 2017 00:36:12 -0500 Subject: [PATCH 4/5] more glide updates --- glide.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/glide.lock b/glide.lock index 124b98cf0..179dc19a9 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ hash: dcaf3fb1290b0d7942c86f0644a7431ac313247936eab9515b1ade9ffe579848 -updated: 2017-01-12T22:49:40.543108221-05:00 +updated: 2017-01-13T00:30:55.237750829-05:00 imports: - name: github.com/btcsuite/btcd version: 153dca5c1e4b5d1ea1523592495e5bedfa503391 @@ -47,7 +47,7 @@ imports: - leveldb/table - leveldb/util - name: github.com/tendermint/abci - version: 068afb5b7f14cf6f9777ceac1390db4433f8a842 + version: 699d45bc678865b004b90213bf88a950f420973b subpackages: - client - example/counter @@ -83,7 +83,7 @@ imports: - name: github.com/tendermint/go-logger version: cefb3a45c0bf3c493a04e9bcd9b1540528be59f2 - name: github.com/tendermint/go-merkle - version: 2979c7eb8aa020fa1cf203654907dbb889703888 + version: 7a86b4486f2cd84ac885c5bbc609fdee2905f5d1 - name: github.com/tendermint/go-p2p version: 3d98f675f30dc4796546b8b890f895926152fa8d subpackages: From ab1fa4db8cc8a9f22c1e26f0f890194443d55751 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Fri, 13 Jan 2017 03:57:46 -0500 Subject: [PATCH 5/5] test: split up test/net/test.sh --- test/net/setup.sh | 26 +++++++++++++++++++++ test/net/start.sh | 34 +++++++++++++++++++++++++++ test/net/test.sh | 58 ++++------------------------------------------- test/test.sh | 6 +++-- 4 files changed, 68 insertions(+), 56 deletions(-) create mode 100644 test/net/setup.sh create mode 100644 test/net/start.sh diff --git a/test/net/setup.sh b/test/net/setup.sh new file mode 100644 index 000000000..148a3c4b7 --- /dev/null +++ b/test/net/setup.sh @@ -0,0 +1,26 @@ +#! /bin/bash +set -eu + +# grab glide for dependency mgmt +go get github.com/Masterminds/glide + +# grab network monitor, install mintnet, netmon +# these might err +echo "... fetching repos. ignore go get errors" +set +e +go get github.com/tendermint/network_testing +go get github.com/tendermint/mintnet +go get github.com/tendermint/netmon +set -e + +# install vendored deps +echo "GOPATH $GOPATH" + +cd $GOPATH/src/github.com/tendermint/mintnet +echo "... install mintnet dir $(pwd)" +glide install +go install +cd $GOPATH/src/github.com/tendermint/netmon +echo "... install netmon dir $(pwd)" +glide install +go install diff --git a/test/net/start.sh b/test/net/start.sh new file mode 100644 index 000000000..1980280d1 --- /dev/null +++ b/test/net/start.sh @@ -0,0 +1,34 @@ +#! /bin/bash +set -eu + +# start a testnet and benchmark throughput using mintnet+netmon via the network_testing repo + +DATACENTER=single +VALSETSIZE=4 +BLOCKSIZE=8092 +TX_SIZE=200 +NTXS=$((BLOCKSIZE*4)) +RESULTSDIR=results +CLOUD_PROVIDER=digitalocean + +set +u +if [[ "$MACH_PREFIX" == "" ]]; then + MACH_PREFIX=mach +fi +set -u + +export TMHEAD=`git rev-parse --abbrev-ref HEAD` +export TM_IMAGE="tendermint/tmbase" + +cd $GOPATH/src/github.com/tendermint/network_testing +echo "... running network test $(pwd)" +bash experiments/exp_throughput.sh $DATACENTER $VALSETSIZE $BLOCKSIZE $TX_SIZE $NTXS $MACH_PREFIX $RESULTSDIR $CLOUD_PROVIDER + +# TODO: publish result! + +# cleanup + +echo "... destroying machines" +mintnet destroy --machines $MACH_PREFIX[1-$VALSETSIZE] + + diff --git a/test/net/test.sh b/test/net/test.sh index ed818dc28..19147eb83 100644 --- a/test/net/test.sh +++ b/test/net/test.sh @@ -1,58 +1,8 @@ #! /bin/bash set -eu -# start a testnet and benchmark throughput using mintnet+netmon via the network_testing repo - -DATACENTER=single -VALSETSIZE=4 -BLOCKSIZE=8092 -TX_SIZE=200 -NTXS=$((BLOCKSIZE*4)) -RESULTSDIR=results -CLOUD_PROVIDER=digitalocean - -set +u -if [[ "$MACH_PREFIX" == "" ]]; then - MACH_PREFIX=mach -fi -set -u - -export TMHEAD=`git rev-parse --abbrev-ref HEAD` -export TM_IMAGE="tendermint/tmbase" - -# grab glide for dependency mgmt -go get github.com/Masterminds/glide - -# grab network monitor, install mintnet, netmon -# these might err -echo "... fetching repos. ignore go get errors" -set +e -go get github.com/tendermint/network_testing -go get github.com/tendermint/mintnet -go get github.com/tendermint/netmon -set -e - -# install vendored deps -echo "GOPATH $GOPATH" - -cd $GOPATH/src/github.com/tendermint/mintnet -echo "... install mintnet dir $(pwd)" -glide install -go install -cd $GOPATH/src/github.com/tendermint/netmon -echo "... install netmon dir $(pwd)" -glide install -go install - -cd $GOPATH/src/github.com/tendermint/network_testing -echo "... running network test $(pwd)" -bash experiments/exp_throughput.sh $DATACENTER $VALSETSIZE $BLOCKSIZE $TX_SIZE $NTXS $MACH_PREFIX $RESULTSDIR $CLOUD_PROVIDER - -# TODO: publish result! - -# cleanup - -echo "... destroying machines" -mintnet destroy --machines $MACH_PREFIX[1-$VALSETSIZE] - +# install mintnet, netmon, fetch network_testing +bash test/net/setup.sh +# start the testnet +bash test/net/start.sh diff --git a/test/test.sh b/test/test.sh index 93908a8ba..0e779a049 100644 --- a/test/test.sh +++ b/test/test.sh @@ -27,6 +27,8 @@ bash test/p2p/test.sh tester BRANCH=`git rev-parse --abbrev-ref HEAD` if [[ $(echo "$BRANCH" | grep "release-") != "" ]]; then echo "" - echo "* branch $BRANCH; running mintnet/netmon throughput benchmark" - bash test/net/test.sh + echo "TODO: run network tests" + #echo "* branch $BRANCH; running mintnet/netmon throughput benchmark" + # TODO: replace mintnet + #bash test/net/test.sh fi