Skip to content

Commit 57d8d46

Browse files
Change monitor intervals from milliseconds to seconds (#1314)
For the fabric tests the monitor intervals were set to single millisecond values such as 3, 4, 5. This adds a massive overhead to the running of the integration tests and isn't needed, so changing them to be seconds instead. Signed-off-by: D <d_kelsey@uk.ibm.com> Co-authored-by: D <d_kelsey@uk.ibm.com>
1 parent 7f4d374 commit 57d8d46

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

packages/caliper-tests-integration/fabric_tests/phase2/benchconfig.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ monitors:
3737
resource:
3838
- module: process
3939
options:
40-
interval: 3
40+
interval: 3000
4141
processes: [{ command: 'node', arguments: 'caliper.js', multiOutput: 'avg' }]

packages/caliper-tests-integration/fabric_tests/phase3/benchconfig.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ monitors:
3737
resource:
3838
- module: process
3939
options:
40-
interval: 3
40+
interval: 3000
4141
processes: [{ command: 'node', arguments: 'caliper.js', multiOutput: 'avg' }]
4242
- module: docker
4343
options:
44-
interval: 4
44+
interval: 4000
4545
containers: ['peer0.org1.example.com', 'peer0.org2.example.com', 'orderer0.example.com', 'orderer1.example.com']

packages/caliper-tests-integration/fabric_tests/phase4/benchconfig.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ monitors:
5151
messageLevel: info
5252
- module: prometheus-push
5353
options:
54-
pushInterval: 5
54+
pushInterval: 5000
5555
pushUrl: "http://localhost:9091"
5656
resource:
5757
- module: prometheus
5858
options:
59-
interval: 5
59+
interval: 5000
6060
url: "http://localhost:9090"
6161
metrics:
6262
include: [peer*, dev*]

packages/caliper-tests-integration/fabric_tests/phase5/benchconfig.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ monitors:
4343
transaction:
4444
- module: prometheus-push
4545
options:
46-
pushInterval: 5
46+
pushInterval: 5000
4747
pushUrl: "http://localhost:9091"
4848
resource:
4949
- module: prometheus
5050
options:
51-
interval: 5
51+
interval: 5000
5252
url: "http://localhost:9090"
5353
metrics:
5454
include: [peer*, dev*]
@@ -71,9 +71,9 @@ monitors:
7171
metrics: [all]
7272
- module: process
7373
options:
74-
interval: 3
74+
interval: 3000
7575
processes: [{ command: 'node', arguments: 'caliper.js', multiOutput: 'avg' }]
7676
- module: docker
7777
options:
78-
interval: 4
78+
interval: 4000
7979
containers: ['peer0.org1.example.com', 'peer0.org2.example.com', 'orderer0.example.com', 'orderer1.example.com']

packages/caliper-tests-integration/fabric_tests/phase6/benchconfig.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ monitors:
4646
transaction:
4747
- module: prometheus-push
4848
options:
49-
pushInterval: 5
49+
pushInterval: 5000
5050
pushUrl: "http://localhost:9091"
5151
resource:
5252
- module: prometheus
5353
options:
54-
interval: 5
54+
interval: 5000
5555
url: "http://localhost:9090"
5656
metrics:
5757
include: [peer*, dev*]

packages/caliper-tests-integration/fabric_tests/phase7/benchconfig.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ monitors:
4646
transaction:
4747
- module: prometheus-push
4848
options:
49-
pushInterval: 5
49+
pushInterval: 5000
5050
pushUrl: "http://localhost:9091"
5151
resource:
5252
- module: prometheus
5353
options:
54-
interval: 5
54+
interval: 5000
5555
url: "http://localhost:9090"
5656
metrics:
5757
include: [peer*, dev*]
@@ -74,10 +74,10 @@ monitors:
7474
metrics: [all]
7575
- module: process
7676
options:
77-
interval: 3
77+
interval: 3000
7878
processes: [{ command: 'node', arguments: 'caliper.js', multiOutput: 'avg' }]
7979
- module: docker
8080
options:
81-
interval: 4
81+
interval: 4000
8282
containers: ['peer0.org1.example.com', 'peer0.org2.example.com', 'orderer0.example.com', 'orderer1.example.com']
8383

0 commit comments

Comments
 (0)