Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve issue in which only first round would be docker-monitored #1135

Merged

Conversation

Viserius
Copy link
Contributor

There is an issue that docker containers are only monitored during the first round of a multi-round benchmark as described in issue #1134.
The problem is caused by the fact that the stop() command sets the this.containers property to the empty array [], while it expects a null value to (re)set the containers list. By setting this to if (!this.containers || this.containers.length == 0), we account for both cases.

Resolves #1134

Signed-off-by: Mark Soelman <info@marksoelman.nl>
@nklincoln
Copy link
Contributor

thanks for the contribution - you will need to sign off the commit before we can merge (DCO bot rules) and once we can figure out the issue in the pipeline with the Ethereum adaptor, we can merge it in

Signed-off-by: Viserius <info@marksoelman.nl>
@Viserius Viserius force-pushed the ms/fix-docker-monitor-rounds branch from 11532fa to 550fdb7 Compare April 29, 2021 17:13
@Viserius
Copy link
Contributor Author

Thank you for highlighting this, I had not seen that!

@nklincoln nklincoln self-assigned this Jun 6, 2021
@nklincoln nklincoln self-requested a review June 6, 2021 18:22
@nklincoln
Copy link
Contributor

@aklenik - Seems the azure re-run builds is not working at the moment - i'm happy for this to go in "as is" and with the ethereum failure based on the fact that the other integration tests would have used this code change

@aklenik aklenik merged commit 4ecfca7 into hyperledger-caliper:master Jul 21, 2021
fraVlaca pushed a commit to fraVlaca/caliper that referenced this pull request Sep 15, 2021
…er-monitor-rounds

Resolve issue in which only first round would be docker-monitored

Signed-off-by: fraVlaca <ocsenarf@outlook.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Docker Monitor with multiple rounds only monitors first round
3 participants