Merge pull request #32 from soramitsu/dev

update params
soramitsu · Nov 16, 2023 · 5aa0700 · 5aa0700
2 parents 8e90d4c + 11857a6
commit 5aa0700
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git 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

diff --git 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
@@ -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
@@ -34,10 +34,10 @@ open class Wrench13 {
     var attemptsPersentage: Int = 2
     var attempt: Int = -1
     var anotherDevDomainIdList: MutableList<DomainId> = 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
@@ -17,7 +17,7 @@ remoteLogin=iroha2-dev
 remotePass=4H7L&KN25%$2jisV8&NTVtiX
 
 #SetUp section
-domainSetUpRumpUp=0
+domainSetUpRumpUp=3
 duringSetUp=0
 setUpUsersOnEachDomain=0