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.

Sign up for GitHub

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

Jump to bottom

Make iochaos wait for toda startup (#1545) #1712

Merged
merged 3 commits into from
Apr 16, 2021
Merged

Make iochaos wait for toda startup (#1545) #1712

merged 3 commits into from
Apr 16, 2021

Conversation

AsterNighT
Copy link
Collaborator

@AsterNighT AsterNighT commented Apr 16, 2021 •
edited by cwen0

What problem does this PR solve?

cherry-pick #1545

What is changed and how does it work?

Checklist

Tests

  • Unit test
  • E2E test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Breaking backward compatibility

Related changes

  • Need to update the documentation

Does this PR introduce a user-facing change?

NONE

@AsterNighT
Copy link
Collaborator Author

/hold

@AsterNighT @ti-chi-bot
Make iochaos wait for toda startup (chaos-mesh#1545)
8814259 
* Make iochaos wait for toda startup

Signed-off-by: AsterNighT <klxjt99@outlook.com>

* Waiting for a toda upgrade for testing

Signed-off-by: AsterNighT <klxjt99@outlook.com>

* Update rpc signaturte due to toda update

Signed-off-by: AsterNighT <klxjt99@outlook.com>

* Add time out for rpc call

Signed-off-by: AsterNighT <klxjt99@outlook.com>

* Fix issue cause by waiting for stdin to close

Signed-off-by: AsterNighT <klxjt99@outlook.com>

* Update boilerplate

Signed-off-by: AsterNighT <klxjt99@outlook.com>

* Remove an unnecessary error check

Signed-off-by: AsterNighT <klxjt99@outlook.com>

* Run make check

Signed-off-by: AsterNighT <klxjt99@outlook.com>

* Back to an older version of etherum rpc to resolve compatibility issue

Signed-off-by: AsterNighT <klxjt99@outlook.com>

* Back more

Signed-off-by: AsterNighT <klxjt99@outlook.com>

Co-authored-by: Ti Chi Robot <71242396+ti-chi-bot@users.noreply.github.com>
Signed-off-by: AsterNighT <klxjt99@outlook.com>
@ti-chi-bot ti-chi-bot added size/L and removed size/XL labels Apr 16, 2021
@AsterNighT
Copy link
Collaborator Author

/unhold

@AsterNighT AsterNighT requested a review from cwen0 April 16, 2021 03:40
sonatype-lift[bot]
sonatype-lift bot reviewed Apr 16, 2021
View reviewed changes
pkg/chaosdaemon/iochaos_server.go
if kerr := s.killIoChaos(ctx, int64(cmd.Process.Pid), ct); kerr != nil {
log.Error(kerr, "kill toda failed", "request", in)
}
return nil, fmt.Errorf("Toda startup takes too long or an error occurs: %s", ret)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ST1005: error strings should not be capitalized
(at-me in a reply with help or ignore)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Muse-Dev ignore

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've recorded this as ignored for this pull request. If you change your mind, just comment @muse-dev unignore.

@cwen0 cwen0 changed the title Cherry pick #1545 to release-1.2 Make iochaos wait for toda startup (#1545) Apr 16, 2021
@AsterNighT
Run go mod tidy
2a8b038 
Signed-off-by: AsterNighT <klxjt99@outlook.com>
cwen0
cwen0 approved these changes Apr 16, 2021
View reviewed changes
Copy link
Member

@cwen0 cwen0 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

fewdan
fewdan approved these changes Apr 16, 2021
View reviewed changes
Copy link
Member

@fewdan fewdan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • cwen0
  • fewdan

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@fewdan
Copy link
Member

fewdan commented Apr 16, 2021

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 2a8b038

@ti-chi-bot ti-chi-bot merged commit adedd6c into chaos-mesh:release-1.2 Apr 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sonatype-lift sonatype-lift[bot] sonatype-lift left review comments

@fewdan fewdan fewdan approved these changes

@cwen0 cwen0 cwen0 approved these changes

@YangKeao YangKeao Awaiting requested review from YangKeao

@Yiyiyimu Yiyiyimu Awaiting requested review from Yiyiyimu

Assignees
No one assigned
Labels
contribution size/L status/can-merge status/LGT2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@AsterNighT @ti-chi-bot @fewdan @cwen0