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

Update WebJobsScriptHostService to remove hardcoded sleep during shut down #9520

Merged
merged 3 commits into from
Sep 8, 2023

Conversation

liliankasem
Copy link
Member

@liliankasem liliankasem commented Sep 8, 2023

Issue describing the changes in this PR

resolves #8681

Pull request checklist

  • My changes do not require documentation changes
    • Otherwise: Documentation issue linked to PR
  • My changes should not be added to the release notes for the next release
    • Otherwise: I've added my notes to release_notes.md
  • My changes do not need to be backported to a previous version
    • Otherwise: Backport tracked by issue/PR #issue_or_pr
  • My changes do not require diagnostic events changes
    • Otherwise: I have added/updated all related diagnostic events and their documentation (Documentation issue linked to PR)
  • I have added all required tests (Unit tests, E2E tests)

Additional information

Antares does not rely on the flag FUNCTIONS_ENABLE_DRAIN_ON_APP_STOPPING – so we can safely assume that this code path is only used in LIMA. Speaking to the LIMA team we learnt that the time for sleep is inconsequential for the LIMA scenario and therefore should be safe to remove.

@liliankasem liliankasem requested a review from a team as a code owner September 8, 2023 17:39
@mathewc
Copy link
Member

mathewc commented Sep 8, 2023

Are we backporting this? I see you said no above.

// Workaround until https://github.com/Azure/azure-functions-host/issues/7188 is addressed.

@liliankasem liliankasem changed the title Update WebJobsScriptHostService to remove hardcoded sleep during restart Update WebJobsScriptHostService to remove hardcoded sleep during shut down Sep 8, 2023
@fabiocav
Copy link
Member

fabiocav commented Sep 8, 2023

@mathewc we're no longer backporting any changes. Do you think this change should be considered?

@mathewc
Copy link
Member

mathewc commented Sep 8, 2023

I agree that we don't need to do a special v3 release for this, but if we end up needing to do one in the future for other reasons, it'd be good to have this change in there as well I think.

@liliankasem
Copy link
Member Author

I agree that we don't need to do a special v3 release for this, but if we end up needing to do one in the future for other reasons, it'd be good to have this change in there as well I think.

That's fair, there's no harm in backporting any who

@liliankasem
Copy link
Member Author

/backport to v3.x

@github-actions
Copy link
Contributor

github-actions bot commented Sep 8, 2023

@github-actions
Copy link
Contributor

github-actions bot commented Sep 8, 2023

@liliankasem backporting to v3.x failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Update WebJobsScriptHostService.cs
Applying: Update release_notes.md
Using index info to reconstruct a base tree...
M	release_notes.md
Falling back to patching base and 3-way merge...
Auto-merging release_notes.md
CONFLICT (content): Merge conflict in release_notes.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Update release_notes.md
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@liliankasem
Copy link
Member Author

Backport here: #9521

@liliankasem liliankasem merged commit 0ad9b92 into dev Sep 8, 2023
@liliankasem liliankasem deleted the liliankasem/remove-sleep-workaround branch September 8, 2023 18:52
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.

Can this workaround be removed?
4 participants