Zach
6 years ago
committed by
GitHub
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 181 additions and 307 deletions
Split View
Diff Options
-
+1 -1rpc/lib/doc.go
-
+4 -4tools/tm-bench/Dockerfile.dev
-
+28 -30tools/tm-bench/Gopkg.lock
-
+0 -4tools/tm-bench/Gopkg.toml
-
+23 -28tools/tm-bench/main.go
-
+4 -4tools/tm-bench/transacter.go
-
+87 -52tools/tm-monitor/Gopkg.lock
-
+2 -10tools/tm-monitor/Gopkg.toml
-
+4 -6tools/tm-monitor/eventmeter/eventmeter.go
-
+3 -5tools/tm-monitor/main.go
-
+4 -4tools/tm-monitor/mock/eventmeter.go
-
+1 -1tools/tm-monitor/monitor/monitor.go
-
+4 -4tools/tm-monitor/monitor/monitor_test.go
-
+2 -1tools/tm-monitor/monitor/network_test.go
-
+5 -4tools/tm-monitor/monitor/node.go
-
+5 -5tools/tm-monitor/monitor/node_test.go
-
+3 -3tools/tm-monitor/rpc.go
-
+1 -1tools/tm-monitor/ton.go
-
+0 -140tools/transact/transact.go
+ 1
- 1
rpc/lib/doc.go
View File
+ 4
- 4
tools/tm-bench/Dockerfile.dev
View File
| @ -1,12 +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 | |||
| RUN mkdir -p /go/src/github.com/tendermint/tendermint/tools/tm-bench | |||
| WORKDIR /go/src/github.com/tendermint/tendermint/tools/tm-bench | |||
| COPY Makefile /go/src/github.com/tendermint/tools/tm-bench/ | |||
| COPY Makefile /go/src/github.com/tendermint/tendermint/tools/tm-bench/ | |||
| RUN make get_tools | |||
| COPY . /go/src/github.com/tendermint/tools/tm-bench | |||
| COPY . /go/src/github.com/tendermint/tendermint/tools/tm-bench | |||
| RUN make get_vendor_deps | |||
+ 28
- 30
tools/tm-bench/Gopkg.lock
View File
+ 0
- 4
tools/tm-bench/Gopkg.toml
View File
+ 23
- 28
tools/tm-bench/main.go
View File
+ 4
- 4
tools/tm-bench/transacter.go
View File
+ 87
- 52
tools/tm-monitor/Gopkg.lock
View File
+ 2
- 10
tools/tm-monitor/Gopkg.toml
View File
+ 4
- 6
tools/tm-monitor/eventmeter/eventmeter.go
View File
+ 3
- 5
tools/tm-monitor/main.go
View File
+ 4
- 4
tools/tm-monitor/mock/eventmeter.go
View File
+ 1
- 1
tools/tm-monitor/monitor/monitor.go
View File
+ 4
- 4
tools/tm-monitor/monitor/monitor_test.go
View File
+ 2
- 1
tools/tm-monitor/monitor/network_test.go
View File
+ 5
- 4
tools/tm-monitor/monitor/node.go
View File
+ 5
- 5
tools/tm-monitor/monitor/node_test.go
View File
+ 3
- 3
tools/tm-monitor/rpc.go
View File
+ 1
- 1
tools/tm-monitor/ton.go
View File
+ 0
- 140
tools/transact/transact.go
View File
| @ -1,140 +0,0 @@ | |||
| package main | |||
| import ( | |||
| "crypto/rand" | |||
| "encoding/binary" | |||
| "encoding/hex" | |||
| "flag" | |||
| "fmt" | |||
| "os" | |||
| "strconv" | |||
| "strings" | |||
| "sync" | |||
| "time" | |||
| "github.com/tendermint/go-rpc/client" | |||
| rpctypes "github.com/tendermint/go-rpc/types" | |||
| ) | |||
| func main() { | |||
| flag.Parse() | |||
| args := flag.Args() | |||
| if len(args) < 2 { | |||
| fmt.Println("transact.go expects at least two arguments (ntxs, hosts)") | |||
| os.Exit(1) | |||
| } | |||
| nTxS, hostS := args[0], args[1] | |||
| nTxs, err := strconv.Atoi(nTxS) | |||
| if err != nil { | |||
| fmt.Println("ntxs must be an integer:", err) | |||
| os.Exit(1) | |||
| } | |||
| hosts := strings.Split(hostS, ",") | |||
| errCh := make(chan error, 1000) | |||
| wg := new(sync.WaitGroup) | |||
| wg.Add(len(hosts)) | |||
| start := time.Now() | |||
| fmt.Printf("Sending %d txs on every host %v\n", nTxs, hosts) | |||
| for i, host := range hosts { | |||
| go broadcastTxsToHost(wg, errCh, i, host, nTxs, 0) | |||
| } | |||
| wg.Wait() | |||
| fmt.Println("Done broadcasting txs. Took", time.Since(start)) | |||
| } | |||
| func broadcastTxsToHost(wg *sync.WaitGroup, errCh chan error, valI int, valHost string, nTxs int, txCount int) { | |||
| reconnectSleepSeconds := time.Second * 1 | |||
| // thisStart := time.Now() | |||
| // cli := rpcclient.NewClientURI(valHost + ":26657") | |||
| fmt.Println("Connecting to host to broadcast txs", valI, valHost) | |||
| cli := rpcclient.NewWSClient(valHost, "/websocket") | |||
| if _, err := cli.Start(); err != nil { | |||
| if nTxs == 0 { | |||
| time.Sleep(reconnectSleepSeconds) | |||
| broadcastTxsToHost(wg, errCh, valI, valHost, nTxs, txCount) | |||
| return | |||
| } | |||
| fmt.Printf("Error starting websocket connection to val%d (%s): %v\n", valI, valHost, err) | |||
| os.Exit(1) | |||
| } | |||
| reconnect := make(chan struct{}) | |||
| go func(count int) { | |||
| LOOP: | |||
| for { | |||
| ticker := time.NewTicker(reconnectSleepSeconds) | |||
| select { | |||
| case <-cli.ResultsCh: | |||
| count += 1 | |||
| // nTxs == 0 means just loop forever | |||
| if nTxs > 0 && count == nTxs { | |||
| break LOOP | |||
| } | |||
| case err := <-cli.ErrorsCh: | |||
| fmt.Println("err: val", valI, valHost, err) | |||
| case <-cli.Quit: | |||
| broadcastTxsToHost(wg, errCh, valI, valHost, nTxs, count) | |||
| return | |||
| case <-reconnect: | |||
| broadcastTxsToHost(wg, errCh, valI, valHost, nTxs, count) | |||
| return | |||
| case <-ticker.C: | |||
| if nTxs == 0 { | |||
| cli.Stop() | |||
| broadcastTxsToHost(wg, errCh, valI, valHost, nTxs, count) | |||
| return | |||
| } | |||
| } | |||
| } | |||
| fmt.Printf("Received all responses from node %d (%s)\n", valI, valHost) | |||
| wg.Done() | |||
| }(txCount) | |||
| var i = 0 | |||
| for { | |||
| /* if i%(nTxs/4) == 0 { | |||
| fmt.Printf("Have sent %d txs to node %d. Total time so far: %v\n", i, valI, time.Since(thisStart)) | |||
| }*/ | |||
| if !cli.IsRunning() { | |||
| return | |||
| } | |||
| tx := generateTx(i, valI) | |||
| if err := cli.WriteJSON(rpctypes.RPCRequest{ | |||
| JSONRPC: "2.0", | |||
| ID: "", | |||
| Method: "broadcast_tx_async", | |||
| Params: []interface{}{hex.EncodeToString(tx)}, | |||
| }); err != nil { | |||
| fmt.Printf("Error sending tx %d to validator %d: %v. Attempt reconnect\n", i, valI, err) | |||
| reconnect <- struct{}{} | |||
| return | |||
| } | |||
| i += 1 | |||
| if nTxs > 0 && i >= nTxs { | |||
| break | |||
| } else if nTxs == 0 { | |||
| time.Sleep(time.Millisecond * 1) | |||
| } | |||
| } | |||
| fmt.Printf("Done sending %d txs to node s%d (%s)\n", nTxs, valI, valHost) | |||
| } | |||
| func generateTx(i, valI int) []byte { | |||
| // a tx encodes the validator index, the tx number, and some random junk | |||
| // TODO: read random bytes into more of the tx | |||
| tx := make([]byte, 250) | |||
| binary.PutUvarint(tx[:32], uint64(valI)) | |||
| binary.PutUvarint(tx[32:64], uint64(i)) | |||
| if _, err := rand.Read(tx[234:]); err != nil { | |||
| fmt.Println("err reading from crypto/rand", err) | |||
| os.Exit(1) | |||
| } | |||
| return tx | |||
| } | |||