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

updog: update signal-hook dependency #1328

Merged
merged 1 commit into from
Mar 11, 2021
Merged

updog: update signal-hook dependency #1328

merged 1 commit into from
Mar 11, 2021

Conversation

webern
Copy link
Contributor

@webern webern commented Feb 17, 2021

Issue number:

Closes #1268

Description of changes:

Update to the latest version of signal-hook, used in updog.

Testing done:

Manual Testing

I added a sleep before updog initiates the shutdown, and I added SIGINT to the list of signals trapped. I waited for the sleep to happen and tried to stop updog with control-C. Updog ignored my SIGINT signals as we would expect.

**22:22:53 [INFO] sleeping before shutdown
^C^C^C^C^C^C^C^C^C^C^C^C^C

Brupop

  • Ran three nodes (with the changes of this PR, i.e. not with the extra sleep and signal described above).
  • Ran brupop.
  • Applied the 1.0.0 interface version to my nodes like this: kubectl label node $(kubectl get nodes -o jsonpath='{.items[*].metadata.name}') bottlerocket.aws/updater-interface-version=1.0.0
  • I watched things like this:
    • watch -c -- make get-nodes-status, and
    • kubectl logs --follow update-operator-controller-689f485f46-d6xvq --namespace bottlerocket

I observed that things were happening. After things were done happening I logged into the Bottlerocket nodes and found that they had been updated. (This was the first time I used brupop, heh, that's pretty cool @jahkeup and @etungsten, fun to watch.)

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

Copy link
Contributor

@tjkirch tjkirch left a comment

Choose a reason for hiding this comment

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

Looks right to me. I think we want to make sure an update with the reboot flag works, and try to ctrl-c it just after the reboot message goes out, which is where this is exercised. We shouldn't be able to ctrl-c at that point.

@webern
Copy link
Contributor Author

webern commented Feb 18, 2021

Looks right to me. I think we want to make sure an update with the reboot flag works, and try to ctrl-c it just after the reboot message goes out, which is where this is exercised. We shouldn't be able to ctrl-c at that point.

I'll give it a try with a sleep in the rust program before the reboot. I'll make this a draft since I'm still figuring out testing.

@webern webern marked this pull request as draft February 18, 2021 00:34
@webern
Copy link
Contributor Author

webern commented Mar 11, 2021

webern force-pushed the webern:signal-hook branch from cddc793 to 2669a80

I fought the git, and the git won. This includes a rebase and a restoration of my original changes.

Edit: it only has my restored changes, apparently I pushed a rebase yesterday or something... I'm so confused. But... the changeset in 2669a80 is the correct, working, tested changeset.

@webern
Copy link
Contributor Author

webern commented Mar 11, 2021

@tjkirch and @etungsten this is ready, taking it out of draft.

@webern webern marked this pull request as ready for review March 11, 2021 02:38
Copy link
Contributor

@zmrow zmrow left a comment

Choose a reason for hiding this comment

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

🕹️

@webern webern merged commit 8eb75c8 into bottlerocket-os:develop Mar 11, 2021
@webern webern deleted the signal-hook branch March 11, 2021 18:00
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.

updog: upgrade signal-hook
4 participants