From d3d104663b3e586c4dfd5c52fbdc4285f7e95a93 Mon Sep 17 00:00:00 2001 From: Brandon Weng Date: Fri, 7 Oct 2022 13:54:22 -0700 Subject: [PATCH 1/3] Move blocking to beginning of runTx --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4fdde5b8ff..796497ba5f 100644 --- a/go.mod +++ b/go.mod @@ -131,7 +131,7 @@ require ( ) replace ( - github.com/cosmos/cosmos-sdk => github.com/sei-protocol/sei-cosmos v0.1.82 + github.com/cosmos/cosmos-sdk => github.com/sei-protocol/sei-cosmos v0.1.103 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/keybase/go-keychain => github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 github.com/tendermint/tendermint => github.com/sei-protocol/sei-tendermint v0.1.56 diff --git a/go.sum b/go.sum index b206a5e179..b4f35f3178 100644 --- a/go.sum +++ b/go.sum @@ -1097,8 +1097,8 @@ github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= github.com/securego/gosec/v2 v2.11.0/go.mod h1:SX8bptShuG8reGC0XS09+a4H2BoWSJi+fscA+Pulbpo= github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY= -github.com/sei-protocol/sei-cosmos v0.1.82 h1:vGsbp35KOZzP3YQoJ8T0MuWpLuC8Ea+6+F5QvHy9a5c= -github.com/sei-protocol/sei-cosmos v0.1.82/go.mod h1:L4fVgFVReigFZAe+43UNhaCf3DQzUZvpN6LlBsWkub4= +github.com/sei-protocol/sei-cosmos v0.1.103 h1:HIWnzmw3TuCtnGYqZj5jKbVztUqHU8rJm9eWQ8ji8po= +github.com/sei-protocol/sei-cosmos v0.1.103/go.mod h1:L4fVgFVReigFZAe+43UNhaCf3DQzUZvpN6LlBsWkub4= github.com/sei-protocol/sei-tendermint v0.1.56 h1:iRVhiIetj+GSwpBzaR9lqgvmgcOqmShfACS6x3tuBIw= github.com/sei-protocol/sei-tendermint v0.1.56/go.mod h1:Olwbjyagrpoxj5DAUhHxMTWDVEfQ3FYdpypaJ3+6Hs8= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= From 875ca6ea29a8fda9ead275d3262f125f2c39fd72 Mon Sep 17 00:00:00 2001 From: Brandon Weng Date: Fri, 7 Oct 2022 14:35:57 -0700 Subject: [PATCH 2/3] fix for gen accounts --- loadtest/scripts/populate_genesis_accounts.py | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/loadtest/scripts/populate_genesis_accounts.py b/loadtest/scripts/populate_genesis_accounts.py index 6f92f1276a..5bb88244b8 100644 --- a/loadtest/scripts/populate_genesis_accounts.py +++ b/loadtest/scripts/populate_genesis_accounts.py @@ -1,15 +1,13 @@ import json import os -import multiprocessing import subprocess import sys import threading import time PARALLEISM=32 -LOCK=threading.Lock() -def add_genesis_account(account_name, local=False): +def add_genesis_account(account_name, lock, local=False): if local: add_key_cmd = f"yes | ~/go/bin/seid keys add {account_name} --keyring-backend test" else: @@ -41,7 +39,7 @@ def add_genesis_account(account_name, local=False): sleep_time = 1 while not success and retry_counter > 0: try: - with LOCK: + with lock: subprocess.check_call( [add_account_cmd], shell=True, @@ -54,10 +52,10 @@ def add_genesis_account(account_name, local=False): time.sleep(sleep_time) -def bulk_create_genesis_accounts(number_of_accounts, start_idx, is_local=False): +def bulk_create_genesis_accounts(number_of_accounts, start_idx, lock, is_local=False): for i in range(start_idx, start_idx + number_of_accounts): print(f"Creating account {i}") - add_genesis_account(f"ta{i}", is_local) + add_genesis_account(f"ta{i}", lock, is_local) def main(): args = sys.argv[1:] @@ -65,14 +63,15 @@ def main(): is_local = False if len(args) > 1 and args[1] == "loc": is_local = True - num_processes = number_of_accounts // PARALLEISM - processes = [] - for i in range(0, number_of_accounts, num_processes): - processes.append(multiprocessing.Process(target=bulk_create_genesis_accounts, args=(num_processes, i, is_local))) - for p in processes: - p.start() - for p in processes: - p.join() + num_threads = number_of_accounts // PARALLEISM + threads = [] + lock=threading.Lock() + for i in range(0, number_of_accounts, num_threads): + threads.append(threading.Thread(target=bulk_create_genesis_accounts, args=(num_threads, i, lock, is_local))) + for t in threads: + t.start() + for t in threads: + t.join() if __name__ == "__main__": main() From 22f3a3269a4fbc013ea17a1c8a6f195503ceb9fa Mon Sep 17 00:00:00 2001 From: Brandon Weng Date: Fri, 7 Oct 2022 15:04:00 -0700 Subject: [PATCH 3/3] tendermint bump with fix --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 796497ba5f..e67ce7c3ac 100644 --- a/go.mod +++ b/go.mod @@ -134,6 +134,6 @@ replace ( github.com/cosmos/cosmos-sdk => github.com/sei-protocol/sei-cosmos v0.1.103 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/keybase/go-keychain => github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 - github.com/tendermint/tendermint => github.com/sei-protocol/sei-tendermint v0.1.56 + github.com/tendermint/tendermint => github.com/sei-protocol/sei-tendermint v0.1.59 google.golang.org/grpc => google.golang.org/grpc v1.33.2 ) diff --git a/go.sum b/go.sum index b4f35f3178..6335db5124 100644 --- a/go.sum +++ b/go.sum @@ -1099,8 +1099,8 @@ github.com/securego/gosec/v2 v2.11.0/go.mod h1:SX8bptShuG8reGC0XS09+a4H2BoWSJi+f github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY= github.com/sei-protocol/sei-cosmos v0.1.103 h1:HIWnzmw3TuCtnGYqZj5jKbVztUqHU8rJm9eWQ8ji8po= github.com/sei-protocol/sei-cosmos v0.1.103/go.mod h1:L4fVgFVReigFZAe+43UNhaCf3DQzUZvpN6LlBsWkub4= -github.com/sei-protocol/sei-tendermint v0.1.56 h1:iRVhiIetj+GSwpBzaR9lqgvmgcOqmShfACS6x3tuBIw= -github.com/sei-protocol/sei-tendermint v0.1.56/go.mod h1:Olwbjyagrpoxj5DAUhHxMTWDVEfQ3FYdpypaJ3+6Hs8= +github.com/sei-protocol/sei-tendermint v0.1.59 h1:POGL60PumMQHF4EzAHzvkGfDnodQJLHpl65LuiwSO/Y= +github.com/sei-protocol/sei-tendermint v0.1.59/go.mod h1:Olwbjyagrpoxj5DAUhHxMTWDVEfQ3FYdpypaJ3+6Hs8= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs= github.com/shirou/gopsutil v2.20.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=