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

First start watching bundle dir, then list/add existing dirs #1781

Merged
merged 1 commit into from
Jun 1, 2022
Merged

First start watching bundle dir, then list/add existing dirs #1781

merged 1 commit into from
Jun 1, 2022

Conversation

twz123
Copy link
Member

@twz123 twz123 commented Jun 1, 2022

Description

Add all directories after the bundle dir has been added to the watcher. Doing it the other way round introduces a race condition when directories get created after the initial listing but before the watch starts.

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update

How Has This Been Tested?

  • Manual test
  • Auto test added

Checklist:

  • My code follows the style guidelines of this project
  • My commit messages are signed-off
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules
  • I have checked my code and corrected any misspellings

@twz123 twz123 added bug Something isn't working area/controlplane labels Jun 1, 2022
@twz123
First start watching bundle dir, then list/add existing dirs
1684054 
Add all directories after the bundle dir has been added to the watcher.
Doing it the other way round introduces a race condition when
directories get created after the initial listing but before the watch
starts.

Signed-off-by: Tom Wieczorek <[email protected]>
@twz123 twz123 force-pushed the fix-bundle-fs-watch branch from e4bf1be to 1684054 Compare June 1, 2022 13:14
@twz123 twz123 marked this pull request as ready for review June 1, 2022 14:27
@twz123 twz123 requested a review from a team as a code owner June 1, 2022 14:27
@twz123 twz123 requested review from kke and s0j June 1, 2022 14:27
This was referenced Jun 1, 2022
Merged
Merged
Merged
@twz123 twz123 added backport/release-1.21 backport/release-1.22 PR that needs to be backported/cherrypicked to release-1.22 branch backport/release-1.23 PR that needs to be backported/cherrypicked to release-1.23 branch labels Jun 1, 2022
@twz123 twz123 enabled auto-merge June 1, 2022 14:45
@twz123 twz123 merged commit c2c2284 into k0sproject:main Jun 1, 2022
@twz123 twz123 deleted the fix-bundle-fs-watch branch June 2, 2022 14:17
@twz123 twz123 mentioned this pull request Jun 8, 2022
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@trawler trawler trawler approved these changes

@jakolehm jakolehm jakolehm approved these changes

@kke kke Awaiting requested review from kke kke is a code owner automatically assigned from k0sproject/k0s-maintainers

@s0j s0j Awaiting requested review from s0j s0j is a code owner automatically assigned from k0sproject/k0s-maintainers

Assignees
No one assigned
Labels
area/controlplane backport/release-1.21 backport/release-1.22 PR that needs to be backported/cherrypicked to release-1.22 branch backport/release-1.23 PR that needs to be backported/cherrypicked to release-1.23 branch bug Something isn't working
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@twz123 @jakolehm @trawler