From 16743198121b9db559f49e873004120a1830e81f Mon Sep 17 00:00:00 2001 From: timofeevmd Date: Thu, 16 Nov 2023 14:23:29 +0400 Subject: [PATCH 1/4] update params Signed-off-by: timofeevmd --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 4d7bc49..f55a07e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,7 +32,6 @@ services: -DseparatedByRampsLasting=1 -DstartingFrom=0 -DdomainSetUpRampUp=5 - -DduringSetUp=120 -DsetUpUsersOnEachDomain=10 networks: - iroha2-perf-net From 7ae492df23c1f4fa8cf8576519486d6bb47a93d3 Mon Sep 17 00:00:00 2001 From: timofeevmd Date: Thu, 16 Nov 2023 14:29:06 +0400 Subject: [PATCH 2/4] Revert "update params" This reverts commit 16743198121b9db559f49e873004120a1830e81f. --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index f55a07e..4d7bc49 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,6 +32,7 @@ services: -DseparatedByRampsLasting=1 -DstartingFrom=0 -DdomainSetUpRampUp=5 + -DduringSetUp=120 -DsetUpUsersOnEachDomain=10 networks: - iroha2-perf-net From 79b35e614385e12f0ccda5d80c0216839a4ff810 Mon Sep 17 00:00:00 2001 From: timofeevmd Date: Thu, 16 Nov 2023 14:29:56 +0400 Subject: [PATCH 3/4] update params Signed-off-by: timofeevmd --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 4d7bc49..f55a07e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,7 +32,6 @@ services: -DseparatedByRampsLasting=1 -DstartingFrom=0 -DdomainSetUpRampUp=5 - -DduringSetUp=120 -DsetUpUsersOnEachDomain=10 networks: - iroha2-perf-net From 59ac910c5dae5f6e144b861646f8abf09e4f9942 Mon Sep 17 00:00:00 2001 From: timofeevmd Date: Thu, 16 Nov 2023 16:37:14 +0400 Subject: [PATCH 4/4] update client connect Signed-off-by: timofeevmd --- src/main/kotlin/jp/co/soramitsu/load/Iroha2SetUp.kt | 9 ++++----- src/main/kotlin/jp/co/soramitsu/load/TransactionOnly.kt | 4 ++-- src/main/kotlin/jp/co/soramitsu/load/toolbox/Wrench13.kt | 4 ++-- src/test/resources/simulation.properties | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/kotlin/jp/co/soramitsu/load/Iroha2SetUp.kt b/src/main/kotlin/jp/co/soramitsu/load/Iroha2SetUp.kt index 8084719..d0c0ea7 100644 --- a/src/main/kotlin/jp/co/soramitsu/load/Iroha2SetUp.kt +++ b/src/main/kotlin/jp/co/soramitsu/load/Iroha2SetUp.kt @@ -35,9 +35,9 @@ class Iroha2SetUp : Wrench13() { val iroha2SetUpScn = scenario("Iroha2SetUp") .exec { Session -> - val randomIndex = (0 until peers.size).random() + /*val randomIndex = (0 until peers.size).random() val randomPeer = peers[randomIndex] - Iroha2Client = buildClient(randomPeer) + Iroha2Client = buildClient(randomPeer)*/ timer = CustomHistogram.subscriptionToBlockStreamTimer.labels( "gatling" @@ -56,7 +56,6 @@ class Iroha2SetUp : Wrench13() { sendMetricsToPrometheus(CustomHistogram.subscriptionToBlockStreamTimer, "transaction") } val anotherDevDomainId = "bulb_${UUID.randomUUID()}_${UUID.randomUUID()}".asDomainId() - //anotherDevDomainIdList.add(anotherDevDomainId) timer = CustomHistogram.domainRegisterTimer.labels( "gatling" , System.getProperty("user.dir").substringAfterLast("/").substringAfterLast("\\") @@ -92,9 +91,9 @@ class Iroha2SetUp : Wrench13() { //accounts on each domain = threads * anotherDevDomainIdList.size * setUpUsersOnEachDomain repeat(SimulationConfig.simulation.setUpUsersOnEachDomain).on( exec { Session -> - val randomIndex = (0 until peers.size).random() + /*val randomIndex = (0 until peers.size).random() val randomPeer = peers[randomIndex] - Iroha2Client = buildClient(randomPeer) + Iroha2Client = buildClient(randomPeer)*/ timer = CustomHistogram.subscriptionToBlockStreamTimer.labels( "gatling" , System.getProperty("user.dir").substringAfterLast("/").substringAfterLast("\\") diff --git a/src/main/kotlin/jp/co/soramitsu/load/TransactionOnly.kt b/src/main/kotlin/jp/co/soramitsu/load/TransactionOnly.kt index 1234bab..c214ec6 100644 --- a/src/main/kotlin/jp/co/soramitsu/load/TransactionOnly.kt +++ b/src/main/kotlin/jp/co/soramitsu/load/TransactionOnly.kt @@ -45,9 +45,9 @@ class TransactionOnly: Wrench13() { Session } .exec { Session -> - val randomIndex = (0 until peers.size).random() + /*val randomIndex = (0 until peers.size).random() val randomPeer = peers[randomIndex] - val Iroha2Client: Iroha2Client = buildClient(randomPeer) + val Iroha2Client: Iroha2Client = buildClient(randomPeer)*/ timer = CustomHistogram.subscriptionToBlockStreamTimer.labels( "gatling", System.getProperty("user.dir").substringAfterLast("/").substringAfterLast("\\"), diff --git a/src/main/kotlin/jp/co/soramitsu/load/toolbox/Wrench13.kt b/src/main/kotlin/jp/co/soramitsu/load/toolbox/Wrench13.kt index cd868a7..8778755 100644 --- a/src/main/kotlin/jp/co/soramitsu/load/toolbox/Wrench13.kt +++ b/src/main/kotlin/jp/co/soramitsu/load/toolbox/Wrench13.kt @@ -34,10 +34,10 @@ open class Wrench13 { var attemptsPersentage: Int = 2 var attempt: Int = -1 var anotherDevDomainIdList: MutableList = mutableListOf() - //var Iroha2Client: Iroha2Client = buildClient("peer-0/api") + var Iroha2Client: Iroha2Client = buildClient("peer-0/api") var pushGateway = PushGateway("pushgateway:9091"); - lateinit var Iroha2Client: Iroha2Client + //lateinit var Iroha2Client: Iroha2Client lateinit var currentDevAccountId: AccountId lateinit var currentDevKeyPair: KeyPair lateinit var currentDevAssetId: AssetId diff --git a/src/test/resources/simulation.properties b/src/test/resources/simulation.properties index 7bd7810..0ccca1e 100644 --- a/src/test/resources/simulation.properties +++ b/src/test/resources/simulation.properties @@ -17,7 +17,7 @@ remoteLogin=iroha2-dev remotePass=4H7L&KN25%$2jisV8&NTVtiX #SetUp section -domainSetUpRumpUp=0 +domainSetUpRumpUp=3 duringSetUp=0 setUpUsersOnEachDomain=0