From da08d589b52aa0742c82f723104c85b36a893cfa Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Mon, 13 Mar 2017 19:10:51 +0400 Subject: [PATCH 1/8] [tm-bench] initial commit --- tm-bench/Dockerfile.dev | 12 +++ tm-bench/LICENSE | 203 ++++++++++++++++++++++++++++++++++++++++ tm-bench/Makefile | 47 ++++++++++ tm-bench/README.md | 3 + tm-bench/glide.lock | 139 +++++++++++++++++++++++++++ tm-bench/glide.yaml | 10 ++ tm-bench/main.go | 94 +++++++++++++++++++ tm-bench/transacter.go | 80 ++++++++++++++++ 8 files changed, 588 insertions(+) create mode 100644 tm-bench/Dockerfile.dev create mode 100644 tm-bench/LICENSE create mode 100644 tm-bench/Makefile create mode 100644 tm-bench/README.md create mode 100644 tm-bench/glide.lock create mode 100644 tm-bench/glide.yaml create mode 100644 tm-bench/main.go create mode 100644 tm-bench/transacter.go diff --git a/tm-bench/Dockerfile.dev b/tm-bench/Dockerfile.dev new file mode 100644 index 000000000..8e4c2d618 --- /dev/null +++ b/tm-bench/Dockerfile.dev @@ -0,0 +1,12 @@ +FROM golang:latest + +RUN mkdir -p /go/src/github.com/tendermint/tools/tm-bench +WORKDIR /go/src/github.com/tendermint/tools/tm-bench + +COPY Makefile /go/src/github.com/tendermint/tools/tm-bench/ +COPY glide.yaml /go/src/github.com/tendermint/tools/tm-bench/ +COPY glide.lock /go/src/github.com/tendermint/tools/tm-bench/ + +RUN make get_deps + +COPY . /go/src/github.com/tendermint/tools/tm-bench diff --git a/tm-bench/LICENSE b/tm-bench/LICENSE new file mode 100644 index 000000000..8fd56597f --- /dev/null +++ b/tm-bench/LICENSE @@ -0,0 +1,203 @@ +Copyright 2017 Tendermint + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/tm-bench/Makefile b/tm-bench/Makefile new file mode 100644 index 000000000..cf31dbd36 --- /dev/null +++ b/tm-bench/Makefile @@ -0,0 +1,47 @@ +DIST_DIRS := find * -type d -exec +VERSION := $(shell perl -ne '/^var version.*"([^"]+)".*$$/ && print "v$$1\n"' main.go) +GOTOOLS = \ + github.com/Masterminds/glide \ + github.com/mitchellh/gox + +tools: + go get -v $(GOTOOLS) + +get_deps: tools + glide install + +build: + go build -ldflags "-X main.version=${VERSION}" + +install: + go install -ldflags "-X main.version=${VERSION}" + +test: + go test + +build-all: tools + gox -verbose \ + -ldflags "-X main.version=${VERSION}" \ + -os="linux darwin windows freebsd openbsd netbsd" \ + -arch="amd64 386 armv5 armv6 armv7 arm64" \ + -osarch="!darwin/arm64" \ + -output="dist/{{.OS}}-{{.Arch}}/{{.Dir}}" . + +dist: build-all + cd dist && \ + $(DIST_DIRS) cp ../LICENSE {} \; && \ + $(DIST_DIRS) cp ../README.md {} \; && \ + $(DIST_DIRS) tar -zcf tm-bench-${VERSION}-{}.tar.gz {} \; && \ + $(DIST_DIRS) zip -r tm-bench-${VERSION}-{}.zip {} \; && \ + cd .. + +build-docker: + rm -f ./tm-bench + docker run -it --rm -v "$(PWD):/go/src/app" -w "/go/src/app" -e "CGO_ENABLED=0" golang:alpine go build -ldflags "-X main.version=${VERSION}" -o tm-bench + docker build -t "tendermint/monitor" . + +clean: + rm -f ./tm-bench + rm -rf ./dist + +.PHONY: tools get_deps build install test build-all dist clean build-docker diff --git a/tm-bench/README.md b/tm-bench/README.md new file mode 100644 index 000000000..724998d4f --- /dev/null +++ b/tm-bench/README.md @@ -0,0 +1,3 @@ +# Tendermint benchmarking tool (tm-bench) + + diff --git a/tm-bench/glide.lock b/tm-bench/glide.lock new file mode 100644 index 000000000..54f709a75 --- /dev/null +++ b/tm-bench/glide.lock @@ -0,0 +1,139 @@ +hash: db5c45d85f63559c544e26ff73ef936faa98b80a9a48fa23a8170b42ea11f916 +updated: 2017-03-13T14:46:21.687902055Z +imports: +- name: github.com/btcsuite/btcd + version: 583684b21bfbde9b5fc4403916fd7c807feb0289 + subpackages: + - btcec +- name: github.com/BurntSushi/toml + version: e643e9ef00b049d75de26e61109c5ea01885cd21 +- name: github.com/go-stack/stack + version: 100eb0c0a9c5b306ca2fb4f165df21d80ada4b82 +- name: github.com/golang/protobuf + version: c9c7427a2a70d2eb3bafa0ab2dc163e45f143317 + subpackages: + - proto +- name: github.com/golang/snappy + version: 553a641470496b2327abcac10b36396bd98e45c9 +- name: github.com/gorilla/websocket + version: 3ab3a8b8831546bd18fd182c20687ca853b2bb13 +- name: github.com/jmhodges/levigo + version: c42d9e0ca023e2198120196f842701bb4c55d7b9 +- name: github.com/mattn/go-colorable + version: a392f450ea64cee2b268dfaacdc2502b50a22b18 +- name: github.com/mattn/go-isatty + version: 57fdcb988a5c543893cc61bce354a6e24ab70022 +- name: github.com/pkg/errors + version: 645ef00459ed84a119197bfb8d8205042c6df63d +- name: github.com/rcrowley/go-metrics + version: 1f30fe9094a513ce4c700b9a54458bbb0c96996c +- name: github.com/syndtr/goleveldb + version: 3c5717caf1475fd25964109a0fc640bd150fce43 + subpackages: + - leveldb + - leveldb/cache + - leveldb/comparer + - leveldb/errors + - leveldb/filter + - leveldb/iterator + - leveldb/journal + - leveldb/memdb + - leveldb/opt + - leveldb/storage + - leveldb/table + - leveldb/util +- name: github.com/tendermint/abci + version: 1236e8fb6eee3a63909f4014a8e84385ead7933d + subpackages: + - types +- name: github.com/tendermint/ed25519 + version: 1f52c6f8b8a5c7908aff4497c186af344b428925 + subpackages: + - edwards25519 + - extra25519 +- name: github.com/tendermint/go-common + version: dcb015dff6c7af21e65c8e2f3b450df19d38c777 +- name: github.com/tendermint/go-config + version: 620dcbbd7d587cf3599dedbf329b64311b0c307a +- name: github.com/tendermint/go-crypto + version: 3f47cfac5fcd9e0f1727c7db980b3559913b3e3a +- name: github.com/tendermint/go-data + version: 32271140e8fd5abdbb22e268d7a02421fa382f0b +- name: github.com/tendermint/go-db + version: eac3f2bc147023957c8bf69432a4e6c4dc5c3f72 +- name: github.com/tendermint/go-events + version: f8ffbfb2be3483e9e7927495590a727f51c0c11f +- name: github.com/tendermint/go-flowrate + version: a20c98e61957faa93b4014fbd902f20ab9317a6a + subpackages: + - flowrate +- name: github.com/tendermint/go-logger + version: cefb3a45c0bf3c493a04e9bcd9b1540528be59f2 +- name: github.com/tendermint/go-merkle + version: 714d4d04557fd068a7c2a1748241ce8428015a96 +- name: github.com/tendermint/go-p2p + version: 97a5ed2d1a17eaee8717b8a32cfaf7a9a82a273d + subpackages: + - upnp +- name: github.com/tendermint/go-rpc + version: b54b9b4ecc2c444f7b11077f24e5abafdcc98676 + subpackages: + - client + - server + - types +- name: github.com/tendermint/go-wire + version: f530b7af7a8b06e612c2063bff6ace49060a085e +- name: github.com/tendermint/log15 + version: ae0f3d6450da9eac7074b439c8e1c3cabf0d5ce6 + subpackages: + - term +- name: github.com/tendermint/tendermint + version: d4f625455109d88e7f55a999fdb25e208f174802 + subpackages: + - rpc/core/types + - types +- name: github.com/tendermint/tools + version: ce69eaa75eb08b21d22b6ecd3cf5a20d38ec57e2 + subpackages: + - tm-monitor + - tm-monitor/eventmeter +- name: golang.org/x/crypto + version: 728b753d0135da6801d45a38e6f43ff55779c5c2 + subpackages: + - curve25519 + - nacl/box + - nacl/secretbox + - openpgp/armor + - openpgp/errors + - poly1305 + - ripemd160 + - salsa20/salsa +- name: golang.org/x/net + version: a6577fac2d73be281a500b310739095313165611 + subpackages: + - context + - http2 + - http2/hpack + - idna + - internal/timeseries + - lex/httplex + - trace +- name: golang.org/x/sys + version: 99f16d856c9836c42d24e7ab64ea72916925fa97 + subpackages: + - unix +- name: google.golang.org/grpc + version: d50cf2db166eaff3f2429425758d12205085eb5b + subpackages: + - codes + - credentials + - grpclog + - internal + - keepalive + - metadata + - naming + - peer + - stats + - tap + - transport +testImports: [] diff --git a/tm-bench/glide.yaml b/tm-bench/glide.yaml new file mode 100644 index 000000000..b59093947 --- /dev/null +++ b/tm-bench/glide.yaml @@ -0,0 +1,10 @@ +package: github.com/tendermint/tools/tm-bench +import: +- package: github.com/pkg/errors +- package: github.com/tendermint/go-rpc + subpackages: + - client + - types +- package: github.com/tendermint/tools + subpackages: + - tm-monitor diff --git a/tm-bench/main.go b/tm-bench/main.go new file mode 100644 index 000000000..6f0e6bece --- /dev/null +++ b/tm-bench/main.go @@ -0,0 +1,94 @@ +package bench + +import ( + "flag" + "fmt" + "os" + "strings" + "time" + + monitor "github.com/tendermint/tools/tm-monitor" +) + +var version = "0.1.0.pre" + +func main() { + var listenAddr string + var connections, duration, txsRate int + + flag.StringVar(&listenAddr, "listen-addr", "tcp://0.0.0.0:46670", "HTTP and Websocket server listen address") + flag.IntVar(&duration, "T", 10, "Exit after the specified amount of time in seconds") + flag.IntVar(&txsRate, "r", 1000, "Txs per second to send in a connection") + + flag.Usage = func() { + fmt.Println(`Tendermint bench. + +Usage: + tm-bench [-listen-addr="tcp://0.0.0.0:46670"] [-T 10] [-r 1000] [endpoints] + +Examples: + tm-bench localhost:46657`) + fmt.Println("Flags:") + flag.PrintDefaults() + } + + flag.Parse() + + if flag.NArg() == 0 { + flag.Usage() + os.Exit(1) + } + + fmt.Printf("Running %ds test @ %s\n", duration, flag.Arg(0)) + + m := startMonitor(flag.Arg(0)) + + transacters := make([]*Transacter, len(endpoints)) + for _, e := range strings.Split(endpoints, ",") { + t := &transacter{e, txsRate} + if err := t.Start(); err != nil { + fmt.Println(err.Error()) + os.Exit(1) + } + append(transacters, t) + } + + select { + case time.After(duration * time.Second): + for _, t := range transacters { + t.Stop() + } + collectAndPrintResults(m) + m.Stop() + } + + cmn.TrapSignal(func() { + for _, t := range transacters { + t.Stop() + } + collectAndPrintResults(m) + m.Stop() + }) +} + +func startMonitor(endpoints string) *monitor.Monitor { + m := monitor.NewMonitor() + + for _, e := range strings.Split(endpoints, ",") { + if err := m.Monitor(monitor.NewNode(e)); err != nil { + fmt.Println(err.Error()) + os.Exit(1) + } + } + + if err := m.Start(); err != nil { + fmt.Println(err.Error()) + os.Exit(1) + } + + return m +} + +func collectAndPrintResults(m *Monitor) { + fmt.Printf("%d", m.Network.Height) +} diff --git a/tm-bench/transacter.go b/tm-bench/transacter.go new file mode 100644 index 000000000..7add76f42 --- /dev/null +++ b/tm-bench/transacter.go @@ -0,0 +1,80 @@ +package bench + +import ( + "crypto/rand" + "encoding/binary" + "encoding/hex" + "fmt" + "sync" + "time" + + "github.com/pkg/errors" + + rpcclient "github.com/tendermint/go-rpc/client" + rpctypes "github.com/tendermint/go-rpc/types" +) + +type transacter struct { + Target string + Rate int + + wsc *rpcclient.WSClient + stopped bool + wg sync.WaitGroup +} + +func (t *transacter) Start() error { + t.wsc = rpcclient.NewWSClient(t.Target, "/websocket") + if _, err := t.wsc.Start(); err != nil { + return err + } + wg.Add(1) + go t.sendLoop() + return nil +} + +func (t *transacter) Stop() { + t.stopped = true + wg.Wait() + t.wsc.Stop() +} + +func (t *transacter) sendLoop() { + var num = 0 + + for { + startTime := time.Now() + for i := 0; i < t.Rate; i++ { + tx := generateTx(num) + err := t.wsc.WriteJSON(rpctypes.RPCRequest{ + JSONRPC: "2.0", + ID: "", + Method: "broadcast_tx_async", + Params: []interface{}{hex.EncodeToString(tx)}, + }) + if err != nil { + panic(errors.Wrap(err, fmt.Sprintf("lost connection to %s", t.Target))) + } + num++ + } + + if t.stopped { + wg.Done() + return + } + + timeToSend := time.Now() - startTime + timer.Sleep(time.Second - timeToSend) + } +} + +// generateTx returns a random byte sequence where first 8 bytes are the number +// of transaction. +func generateTx(num) []byte { + tx := make([]byte, 250) + binary.PutUvarint(tx[:32], uint64(num)) + if _, err := rand.Read(tx[234:]); err != nil { + panic(errors.Wrap(err, "err reading from crypto/rand")) + } + return tx +} From 8af2fe79e13ab9f6b9cb62242d07f9f52c2a4dfb Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Thu, 16 Mar 2017 20:53:09 +0400 Subject: [PATCH 2/8] [tm-bench] show basic stats ``` === Avg block time: 1225.504 ms Avg tx throughput: 905 per sec Avg block latency: 6.121 ms === ``` --- tm-bench/glide.lock | 26 +++++++++++++++++-------- tm-bench/glide.yaml | 2 +- tm-bench/main.go | 43 +++++++++++++++++++----------------------- tm-bench/transacter.go | 24 +++++++++++++++-------- 4 files changed, 54 insertions(+), 41 deletions(-) diff --git a/tm-bench/glide.lock b/tm-bench/glide.lock index 54f709a75..bcaf59666 100644 --- a/tm-bench/glide.lock +++ b/tm-bench/glide.lock @@ -1,5 +1,5 @@ -hash: db5c45d85f63559c544e26ff73ef936faa98b80a9a48fa23a8170b42ea11f916 -updated: 2017-03-13T14:46:21.687902055Z +hash: 7b3982490e9c4cdc9467e849959fd8d6ccec8f8f9e81fc56f29e8e9c67bf3b53 +updated: 2017-03-16T15:16:05.301074208Z imports: - name: github.com/btcsuite/btcd version: 583684b21bfbde9b5fc4403916fd7c807feb0289 @@ -7,6 +7,13 @@ imports: - btcec - name: github.com/BurntSushi/toml version: e643e9ef00b049d75de26e61109c5ea01885cd21 +- name: github.com/go-kit/kit + version: b6f30a2e0632f5722fb26d8765d726335b79d3e6 + subpackages: + - log + - log/term +- name: github.com/go-logfmt/logfmt + version: 390ab7935ee28ec6b286364bba9b4dd6410cb3d5 - name: github.com/go-stack/stack version: 100eb0c0a9c5b306ca2fb4f165df21d80ada4b82 - name: github.com/golang/protobuf @@ -16,15 +23,17 @@ imports: - name: github.com/golang/snappy version: 553a641470496b2327abcac10b36396bd98e45c9 - name: github.com/gorilla/websocket - version: 3ab3a8b8831546bd18fd182c20687ca853b2bb13 + version: b258b4fadb573ac412f187b9f31974ea99d32f50 - name: github.com/jmhodges/levigo version: c42d9e0ca023e2198120196f842701bb4c55d7b9 +- name: github.com/kr/logfmt + version: b84e30acd515aadc4b783ad4ff83aff3299bdfe0 - name: github.com/mattn/go-colorable version: a392f450ea64cee2b268dfaacdc2502b50a22b18 - name: github.com/mattn/go-isatty version: 57fdcb988a5c543893cc61bce354a6e24ab70022 - name: github.com/pkg/errors - version: 645ef00459ed84a119197bfb8d8205042c6df63d + version: bfd5150e4e41705ded2129ec33379de1cb90b513 - name: github.com/rcrowley/go-metrics version: 1f30fe9094a513ce4c700b9a54458bbb0c96996c - name: github.com/syndtr/goleveldb @@ -43,7 +52,7 @@ imports: - leveldb/table - leveldb/util - name: github.com/tendermint/abci - version: 1236e8fb6eee3a63909f4014a8e84385ead7933d + version: af792eac777de757cd496349a5f6b5313738fcbc subpackages: - types - name: github.com/tendermint/ed25519 @@ -76,7 +85,7 @@ imports: subpackages: - upnp - name: github.com/tendermint/go-rpc - version: b54b9b4ecc2c444f7b11077f24e5abafdcc98676 + version: fcea0cda21f64889be00a0f4b6d13266b1a76ee7 subpackages: - client - server @@ -93,10 +102,11 @@ imports: - rpc/core/types - types - name: github.com/tendermint/tools - version: ce69eaa75eb08b21d22b6ecd3cf5a20d38ec57e2 + version: fb28fd4c13759026de23d98bb494a022840278c1 subpackages: - tm-monitor - tm-monitor/eventmeter + - tm-monitor/monitor - name: golang.org/x/crypto version: 728b753d0135da6801d45a38e6f43ff55779c5c2 subpackages: @@ -123,7 +133,7 @@ imports: subpackages: - unix - name: google.golang.org/grpc - version: d50cf2db166eaff3f2429425758d12205085eb5b + version: cdee119ee21e61eef7093a41ba148fa83585e143 subpackages: - codes - credentials diff --git a/tm-bench/glide.yaml b/tm-bench/glide.yaml index b59093947..cb255784a 100644 --- a/tm-bench/glide.yaml +++ b/tm-bench/glide.yaml @@ -7,4 +7,4 @@ import: - types - package: github.com/tendermint/tools subpackages: - - tm-monitor + - tm-monitor/monitor diff --git a/tm-bench/main.go b/tm-bench/main.go index 6f0e6bece..d91dfe35c 100644 --- a/tm-bench/main.go +++ b/tm-bench/main.go @@ -1,4 +1,4 @@ -package bench +package main import ( "flag" @@ -7,14 +7,14 @@ import ( "strings" "time" - monitor "github.com/tendermint/tools/tm-monitor" + "github.com/tendermint/tools/tm-monitor/monitor" ) var version = "0.1.0.pre" func main() { var listenAddr string - var connections, duration, txsRate int + var duration, txsRate int flag.StringVar(&listenAddr, "listen-addr", "tcp://0.0.0.0:46670", "HTTP and Websocket server listen address") flag.IntVar(&duration, "T", 10, "Exit after the specified amount of time in seconds") @@ -43,32 +43,24 @@ Examples: m := startMonitor(flag.Arg(0)) - transacters := make([]*Transacter, len(endpoints)) - for _, e := range strings.Split(endpoints, ",") { - t := &transacter{e, txsRate} + endpoints := strings.Split(flag.Arg(0), ",") + transacters := make([]*transacter, len(endpoints)) + for i, e := range endpoints { + t := newTransacter(e, txsRate) if err := t.Start(); err != nil { - fmt.Println(err.Error()) - os.Exit(1) + panic(err) } - append(transacters, t) + transacters[i] = t } select { - case time.After(duration * time.Second): + case <-time.After(time.Duration(duration) * time.Second): for _, t := range transacters { t.Stop() } collectAndPrintResults(m) m.Stop() } - - cmn.TrapSignal(func() { - for _, t := range transacters { - t.Stop() - } - collectAndPrintResults(m) - m.Stop() - }) } func startMonitor(endpoints string) *monitor.Monitor { @@ -76,19 +68,22 @@ func startMonitor(endpoints string) *monitor.Monitor { for _, e := range strings.Split(endpoints, ",") { if err := m.Monitor(monitor.NewNode(e)); err != nil { - fmt.Println(err.Error()) - os.Exit(1) + panic(err) } } if err := m.Start(); err != nil { - fmt.Println(err.Error()) - os.Exit(1) + panic(err) } return m } -func collectAndPrintResults(m *Monitor) { - fmt.Printf("%d", m.Network.Height) +func collectAndPrintResults(m *monitor.Monitor) { + n := m.Network + fmt.Println("===") + fmt.Printf("Avg block time: %.3f ms\n", n.AvgBlockTime) + fmt.Printf("Avg tx throughput: %.0f per sec\n", n.AvgTxThroughput) + fmt.Printf("Avg block latency: %.3f ms\n", n.AvgBlockLatency) + fmt.Println("===") } diff --git a/tm-bench/transacter.go b/tm-bench/transacter.go index 7add76f42..5500a0979 100644 --- a/tm-bench/transacter.go +++ b/tm-bench/transacter.go @@ -1,4 +1,4 @@ -package bench +package main import ( "crypto/rand" @@ -23,19 +23,27 @@ type transacter struct { wg sync.WaitGroup } +func newTransacter(target string, rate int) *transacter { + return &transacter{ + Target: target, + Rate: rate, + wsc: rpcclient.NewWSClient(target, "/websocket"), + } +} + func (t *transacter) Start() error { - t.wsc = rpcclient.NewWSClient(t.Target, "/websocket") + t.stopped = false if _, err := t.wsc.Start(); err != nil { return err } - wg.Add(1) + t.wg.Add(1) go t.sendLoop() return nil } func (t *transacter) Stop() { t.stopped = true - wg.Wait() + t.wg.Wait() t.wsc.Stop() } @@ -59,18 +67,18 @@ func (t *transacter) sendLoop() { } if t.stopped { - wg.Done() + t.wg.Done() return } - timeToSend := time.Now() - startTime - timer.Sleep(time.Second - timeToSend) + timeToSend := time.Now().Sub(startTime) + time.Sleep(time.Second - timeToSend) } } // generateTx returns a random byte sequence where first 8 bytes are the number // of transaction. -func generateTx(num) []byte { +func generateTx(num int) []byte { tx := make([]byte, 250) binary.PutUvarint(tx[:32], uint64(num)) if _, err := rand.Read(tx[234:]); err != nil { From 7ee9bb4ea2c8613b785ef634d3969aaceed04617 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Fri, 17 Mar 2017 00:56:22 +0400 Subject: [PATCH 3/8] more accurate statistics --- tm-bench/main.go | 118 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 89 insertions(+), 29 deletions(-) diff --git a/tm-bench/main.go b/tm-bench/main.go index d91dfe35c..db73ecab8 100644 --- a/tm-bench/main.go +++ b/tm-bench/main.go @@ -5,13 +5,22 @@ import ( "fmt" "os" "strings" + "text/tabwriter" "time" + metrics "github.com/rcrowley/go-metrics" + tmtypes "github.com/tendermint/tendermint/types" "github.com/tendermint/tools/tm-monitor/monitor" ) var version = "0.1.0.pre" +type statistics struct { + BlockTimeSample metrics.Histogram + TxThroughputSample metrics.Histogram + BlockLatency metrics.Histogram +} + func main() { var listenAddr string var duration, txsRate int @@ -41,49 +50,100 @@ Examples: fmt.Printf("Running %ds test @ %s\n", duration, flag.Arg(0)) - m := startMonitor(flag.Arg(0)) - endpoints := strings.Split(flag.Arg(0), ",") - transacters := make([]*transacter, len(endpoints)) - for i, e := range endpoints { - t := newTransacter(e, txsRate) - if err := t.Start(); err != nil { - panic(err) - } - transacters[i] = t + + blockCh := make(chan tmtypes.Header, 100) + blockLatencyCh := make(chan float64, 100) + + nodes := startNodes(endpoints, blockCh, blockLatencyCh) + + transacters := startTransacters(endpoints, txsRate) + + stats := &statistics{ + BlockTimeSample: metrics.NewHistogram(metrics.NewUniformSample(1000)), + TxThroughputSample: metrics.NewHistogram(metrics.NewUniformSample(1000)), + BlockLatency: metrics.NewHistogram(metrics.NewUniformSample(1000)), } - select { - case <-time.After(time.Duration(duration) * time.Second): - for _, t := range transacters { - t.Stop() + lastBlockHeight := -1 + + durationTimer := time.After(time.Duration(duration) * time.Second) + ticker := time.NewTicker(1 * time.Second) + var blocks, txs int + for { + select { + case b := <-blockCh: + if lastBlockHeight < b.Height { + blocks++ + txs += b.NumTxs + lastBlockHeight = b.Height + } + case l := <-blockLatencyCh: + stats.BlockLatency.Update(int64(l)) + case <-ticker.C: + stats.BlockTimeSample.Update(int64(blocks)) + stats.TxThroughputSample.Update(int64(txs)) + blocks = 0 + txs = 0 + case <-durationTimer: + for _, t := range transacters { + t.Stop() + } + + printStatistics(stats) + + for _, n := range nodes { + n.Stop() + } + return } - collectAndPrintResults(m) - m.Stop() } } -func startMonitor(endpoints string) *monitor.Monitor { - m := monitor.NewMonitor() +func startNodes(endpoints []string, blockCh chan<- tmtypes.Header, blockLatencyCh chan<- float64) []*monitor.Node { + nodes := make([]*monitor.Node, len(endpoints)) - for _, e := range strings.Split(endpoints, ",") { - if err := m.Monitor(monitor.NewNode(e)); err != nil { + for i, e := range endpoints { + n := monitor.NewNode(e) + n.SendBlocksTo(blockCh) + n.SendBlockLatenciesTo(blockLatencyCh) + if err := n.Start(); err != nil { panic(err) } + nodes[i] = n } - if err := m.Start(); err != nil { - panic(err) + return nodes +} + +func startTransacters(endpoints []string, txsRate int) []*transacter { + transacters := make([]*transacter, len(endpoints)) + + for i, e := range endpoints { + t := newTransacter(e, txsRate) + if err := t.Start(); err != nil { + panic(err) + } + transacters[i] = t } - return m + return transacters } -func collectAndPrintResults(m *monitor.Monitor) { - n := m.Network - fmt.Println("===") - fmt.Printf("Avg block time: %.3f ms\n", n.AvgBlockTime) - fmt.Printf("Avg tx throughput: %.0f per sec\n", n.AvgTxThroughput) - fmt.Printf("Avg block latency: %.3f ms\n", n.AvgBlockLatency) - fmt.Println("===") +func printStatistics(stats *statistics) { + w := tabwriter.NewWriter(os.Stdout, 0, 0, 5, ' ', 0) + fmt.Fprintln(w, "Stats\tAvg\tStdev\tMax\t") + fmt.Fprintln(w, fmt.Sprintf("Block latency\t%.2fms\t%.2fms\t%dms\t", + stats.BlockLatency.Mean()/1000000.0, + stats.BlockLatency.StdDev()/1000000.0, + stats.BlockLatency.Max()/1000000)) + fmt.Fprintln(w, fmt.Sprintf("Blocks/sec\t%.3f\t%.3f\t%d\t", + stats.BlockTimeSample.Mean(), + stats.BlockTimeSample.StdDev(), + stats.BlockTimeSample.Max())) + fmt.Fprintln(w, fmt.Sprintf("Txs/sec\t%.0f\t%.0f\t%d\t", + stats.TxThroughputSample.Mean(), + stats.TxThroughputSample.StdDev(), + stats.TxThroughputSample.Max())) + w.Flush() } From f36d60552f4e300e10141781aab25d1a64ec33df Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Fri, 17 Mar 2017 01:12:37 +0400 Subject: [PATCH 4/8] remove listenAddr flag --- tm-bench/main.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tm-bench/main.go b/tm-bench/main.go index db73ecab8..993a521d3 100644 --- a/tm-bench/main.go +++ b/tm-bench/main.go @@ -22,18 +22,16 @@ type statistics struct { } func main() { - var listenAddr string var duration, txsRate int - flag.StringVar(&listenAddr, "listen-addr", "tcp://0.0.0.0:46670", "HTTP and Websocket server listen address") flag.IntVar(&duration, "T", 10, "Exit after the specified amount of time in seconds") flag.IntVar(&txsRate, "r", 1000, "Txs per second to send in a connection") flag.Usage = func() { - fmt.Println(`Tendermint bench. + fmt.Println(`Tendermint blockchain benchmarking tool. Usage: - tm-bench [-listen-addr="tcp://0.0.0.0:46670"] [-T 10] [-r 1000] [endpoints] + tm-bench [-T 10] [-r 1000] [endpoints] Examples: tm-bench localhost:46657`) From 674d1d3e1b4b4f19d8557b9989e5843224725b3e Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Fri, 17 Mar 2017 01:12:53 +0400 Subject: [PATCH 5/8] update readme --- tm-bench/README.md | 60 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/tm-bench/README.md b/tm-bench/README.md index 724998d4f..ec78b965d 100644 --- a/tm-bench/README.md +++ b/tm-bench/README.md @@ -1,3 +1,61 @@ -# Tendermint benchmarking tool (tm-bench) +# Tendermint blockchain benchmarking tool (tm-bench) +`tm-bench` is a simple benchmarking tool for [Tendermint +core](https://github.com/tendermint/tendermint) nodes. +``` +λ tm-bench -T10 -r1000 localhost:46657 +Stats Avg Stdev Max +Block latency 6.18ms 3.19ms 14ms +Blocks/sec 0.828 0.378 1 +Txs/sec 963 493 1811 +``` + +* [QuickStart using Docker](#quickstart-using-docker) +* [QuickStart using binaries](#quickstart-using-binaries) +* [Usage](#usage) + +## QuickStart using Docker + +``` +docker run -it --rm -v "/tmp:/tendermint" tendermint/tendermint init +docker run -it --rm -v "/tmp:/tendermint" -p "46657:46657" --name=tm tendermint/tendermint + +docker run -it --rm --link=tm tendermint/bench tm:46657 +``` + +## QuickStart using binaries + +Linux: + +``` +curl -L https://s3-us-west-2.amazonaws.com/tendermint/0.8.0/tendermint_linux_amd64.zip && sudo unzip -d /usr/local/bin tendermint_linux_amd64.zip && sudo chmod +x tendermint +tendermint init +tendermint node --app_proxy=dummy + +tm-bench localhost:46657 +``` + +Max OS: + +``` +curl -L https://s3-us-west-2.amazonaws.com/tendermint/0.8.0/tendermint_darwin_amd64.zip && sudo unzip -d /usr/local/bin tendermint_darwin_amd64.zip && sudo chmod +x tendermint +tendermint init +tendermint node --app_proxy=dummy + +tm-bench localhost:46657 +``` + +## Usage + +``` +tm-bench [-T 10] [-r 1000] [endpoints] + +Examples: + tm-bench localhost:46657 +Flags: + -T int + Exit after the specified amount of time in seconds (default 10) + -r int + Txs per second to send in a connection (default 1000) +``` From 68b07b9c97164a3825bdb597e657942172bdea50 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Fri, 17 Mar 2017 13:13:06 +0400 Subject: [PATCH 6/8] connections flag --- tm-bench/README.md | 2 +- tm-bench/main.go | 11 ++++--- tm-bench/transacter.go | 71 ++++++++++++++++++++++++++---------------- 3 files changed, 51 insertions(+), 33 deletions(-) diff --git a/tm-bench/README.md b/tm-bench/README.md index ec78b965d..810951499 100644 --- a/tm-bench/README.md +++ b/tm-bench/README.md @@ -4,7 +4,7 @@ core](https://github.com/tendermint/tendermint) nodes. ``` -λ tm-bench -T10 -r1000 localhost:46657 +λ tm-bench -T 10 -r 1000 localhost:46657 Stats Avg Stdev Max Block latency 6.18ms 3.19ms 14ms Blocks/sec 0.828 0.378 1 diff --git a/tm-bench/main.go b/tm-bench/main.go index 993a521d3..fbeac5c7a 100644 --- a/tm-bench/main.go +++ b/tm-bench/main.go @@ -22,8 +22,9 @@ type statistics struct { } func main() { - var duration, txsRate int + var duration, txsRate, connections int + flag.IntVar(&connections, "c", 1, "Connections to keep open per endpoint") flag.IntVar(&duration, "T", 10, "Exit after the specified amount of time in seconds") flag.IntVar(&txsRate, "r", 1000, "Txs per second to send in a connection") @@ -31,7 +32,7 @@ func main() { fmt.Println(`Tendermint blockchain benchmarking tool. Usage: - tm-bench [-T 10] [-r 1000] [endpoints] + tm-bench [-c 1] [-T 10] [-r 1000] [endpoints] Examples: tm-bench localhost:46657`) @@ -55,7 +56,7 @@ Examples: nodes := startNodes(endpoints, blockCh, blockLatencyCh) - transacters := startTransacters(endpoints, txsRate) + transacters := startTransacters(endpoints, connections, txsRate) stats := &statistics{ BlockTimeSample: metrics.NewHistogram(metrics.NewUniformSample(1000)), @@ -114,11 +115,11 @@ func startNodes(endpoints []string, blockCh chan<- tmtypes.Header, blockLatencyC return nodes } -func startTransacters(endpoints []string, txsRate int) []*transacter { +func startTransacters(endpoints []string, connections int, txsRate int) []*transacter { transacters := make([]*transacter, len(endpoints)) for i, e := range endpoints { - t := newTransacter(e, txsRate) + t := newTransacter(e, connections, txsRate) if err := t.Start(); err != nil { panic(err) } diff --git a/tm-bench/transacter.go b/tm-bench/transacter.go index 5500a0979..cdfee0958 100644 --- a/tm-bench/transacter.go +++ b/tm-bench/transacter.go @@ -15,72 +15,89 @@ import ( ) type transacter struct { - Target string - Rate int + Target string + Rate int + Connections int - wsc *rpcclient.WSClient - stopped bool + conns []*rpcclient.WSClient wg sync.WaitGroup + stopped bool } -func newTransacter(target string, rate int) *transacter { +func newTransacter(target string, connections int, rate int) *transacter { + conns := make([]*rpcclient.WSClient, connections) + for i := 0; i < connections; i++ { + conns[i] = rpcclient.NewWSClient(target, "/websocket") + } + return &transacter{ - Target: target, - Rate: rate, - wsc: rpcclient.NewWSClient(target, "/websocket"), + Target: target, + Rate: rate, + Connections: connections, + conns: conns, } } func (t *transacter) Start() error { t.stopped = false - if _, err := t.wsc.Start(); err != nil { - return err + + for _, c := range t.conns { + if _, err := c.Start(); err != nil { + return err + } + } + + for i := 0; i < t.Connections; i++ { + t.wg.Add(1) + go t.sendLoop(i) } - t.wg.Add(1) - go t.sendLoop() + return nil } func (t *transacter) Stop() { t.stopped = true t.wg.Wait() - t.wsc.Stop() + for _, c := range t.conns { + c.Stop() + } } -func (t *transacter) sendLoop() { - var num = 0 +func (t *transacter) sendLoop(connIndex int) { + conn := t.conns[connIndex] + var num = 0 for { startTime := time.Now() + for i := 0; i < t.Rate; i++ { - tx := generateTx(num) - err := t.wsc.WriteJSON(rpctypes.RPCRequest{ + if t.stopped { + t.wg.Done() + return + } + + tx := generateTx(connIndex, num) + err := conn.WriteJSON(rpctypes.RPCRequest{ JSONRPC: "2.0", ID: "", Method: "broadcast_tx_async", Params: []interface{}{hex.EncodeToString(tx)}, }) if err != nil { - panic(errors.Wrap(err, fmt.Sprintf("lost connection to %s", t.Target))) + panic(errors.Wrap(err, fmt.Sprintf("lost connection to %s", conn.Address))) } num++ } - if t.stopped { - t.wg.Done() - return - } - timeToSend := time.Now().Sub(startTime) time.Sleep(time.Second - timeToSend) } } -// generateTx returns a random byte sequence where first 8 bytes are the number -// of transaction. -func generateTx(num int) []byte { +func generateTx(a int, b int) []byte { tx := make([]byte, 250) - binary.PutUvarint(tx[:32], uint64(num)) + binary.PutUvarint(tx[:32], uint64(a)) + binary.PutUvarint(tx[32:64], uint64(b)) if _, err := rand.Read(tx[234:]); err != nil { panic(errors.Wrap(err, "err reading from crypto/rand")) } From a6130910bf2ee795f3cfbcb062819d6cc9be74a9 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Fri, 17 Mar 2017 14:52:14 +0400 Subject: [PATCH 7/8] use math/rand, no need in crypto --- tm-bench/transacter.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tm-bench/transacter.go b/tm-bench/transacter.go index cdfee0958..d35a9e6f0 100644 --- a/tm-bench/transacter.go +++ b/tm-bench/transacter.go @@ -1,10 +1,10 @@ package main import ( - "crypto/rand" "encoding/binary" "encoding/hex" "fmt" + "math/rand" "sync" "time" From 101418cf755eaa3f47fbca16ee87aec3441a14a6 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Fri, 17 Mar 2017 14:54:27 +0400 Subject: [PATCH 8/8] update readme --- tm-bench/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tm-bench/README.md b/tm-bench/README.md index 810951499..43642a753 100644 --- a/tm-bench/README.md +++ b/tm-bench/README.md @@ -49,13 +49,15 @@ tm-bench localhost:46657 ## Usage ``` -tm-bench [-T 10] [-r 1000] [endpoints] +tm-bench [-c 1] [-T 10] [-r 1000] [endpoints] Examples: tm-bench localhost:46657 Flags: -T int Exit after the specified amount of time in seconds (default 10) + -c int + Connections to keep open per endpoint (default 1) -r int Txs per second to send in a connection (default 1000) ```