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

Increases core container timeout to match core shutdown time #2417

Merged

Conversation

agners
Copy link
Member

@agners agners commented Jan 11, 2021

Align the core container timeout with what the core container
uses as grace period.

Relates to home-assistant/core#45029.

Proposed change

Type of change

  • Dependency upgrade
  • Bugfix (non-breaking change which fixes an issue)
  • New feature (which adds functionality to the supervisor)
  • Breaking change (fix/feature causing existing functionality to break)
  • Code quality improvements to existing code or addition of tests

Additional information

  • This PR fixes or closes issue: fixes #
  • This PR is related to issue:
  • Link to documentation pull request:

Checklist

  • The code change is tested and works locally.
  • Local tests pass. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.
  • I have followed the development checklist
  • The code has been formatted using Black (black --fast supervisor tests)
  • Tests have been added to verify that the new code works.

If API endpoints of add-on configuration are added/changed:

Align the core container timeout with what the core container
uses as grace period.
@pvizeli
Copy link
Member

pvizeli commented Jan 11, 2021

Have no effect. Is controlled by the S6 supervisor. This timeout here is only like a master timeout. You can set it to 1h which take not in effect because of the S6 Supervisor.

NVM :)

@pvizeli pvizeli merged commit d53f5e2 into home-assistant:main Jan 11, 2021
@agners
Copy link
Member Author

agners commented Jan 11, 2021

FWIW, it is actually the other way around, this will take precedence over S6 supervisor. E.g. if the supervisor does not kill, Docker will finish the job :-o

Jan 10 23:13:27 homeassistant dockerd[409]: time="2021-01-10T23:13:27.134098966Z" level=info msg="Container eb034fca9c7da03fd80c08203e8725b5f1b4029f01d6c91b8ba892360791c404 failed to exit within 60 seconds of signal 15 - using the force"

But yeah, I adjusted that timeout as well.

Thanks for reviewing/merging.

@ludeeus ludeeus added the bugfix A bug fix label Jan 11, 2021
@github-actions github-actions bot locked and limited conversation to collaborators Jan 13, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants