Skip to content

Change compose lock to use DataStore()#3563

Merged
AkihiroSuda merged 1 commit intocontainerd:mainfrom
apostasie:compose-lock-take-2
Oct 18, 2024
Merged

Change compose lock to use DataStore()#3563
AkihiroSuda merged 1 commit intocontainerd:mainfrom
apostasie:compose-lock-take-2

Conversation

@apostasie
Copy link
Copy Markdown
Contributor

@apostasie apostasie commented Oct 17, 2024

In some rare (?) circumstances, DataRoot might not exist yet (eg: fresh install, first command being run being a compose command).

Changing the lock location to rely on DataStore() instead, which does provide existence guarantee (and is also a bit more specific).

Failure was seen on unmerged PRs CI runs when parallelization triggered an execution order that produced the situation above.

Signed-off-by: apostasie <spam_blackhole@farcloser.world>
@apostasie apostasie force-pushed the compose-lock-take-2 branch from 2f6d50f to 84b4d94 Compare October 17, 2024 20:40
@apostasie apostasie changed the title [WIP] Change compose lock to use DataStore() Change compose lock to use DataStore() Oct 17, 2024
@apostasie apostasie marked this pull request as ready for review October 17, 2024 21:05
@apostasie
Copy link
Copy Markdown
Contributor Author

@AkihiroSuda at your convenience.

@apostasie
Copy link
Copy Markdown
Contributor Author

@djdongjin if you are still around, I can use this to fix CI bustage on upcoming PRs (specifically #3535)

@AkihiroSuda AkihiroSuda added this to the v2.0.0 milestone Oct 18, 2024
Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

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

Thanks

@AkihiroSuda AkihiroSuda merged commit 44bd960 into containerd:main Oct 18, 2024
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.

2 participants