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

Remove a manual layerStore.Touch() call from store.Shutdown() #1381

Merged
merged 1 commit into from Oct 14, 2022

Conversation

mtrmac
Copy link
Collaborator

@mtrmac mtrmac commented Oct 13, 2022

It's completely unclear to me why this is necessary; the unmount calls actually write to the separate mountpoints.json file, with a separate lock.

When this was originally introduced in b046fb5 , there wasn't a separate mountpoints.json file (changed in 0183a29 ), and store.go was manually calling Touch() everywhere (changed in c496eac) ; so my best guess is that this is just an artifact of making those two API changes, and the Touch() is not actually necessary.

@nalind @rhatdan is there some non-obvious purpose for the Touch() call here?

@rhatdan
Copy link
Member

rhatdan commented Oct 13, 2022

None that I know of.
LGTM
@nalind @saschagrunert @vrothberg @giuseppe PTAL

Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

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

Changes and explanation makes sense to me.

Let's wait for a head nod from @nalind.

@mtrmac mtrmac force-pushed the shutdown-touch branch 2 times, most recently from 05d7c91 to a581260 Compare October 13, 2022 22:05
It's completely unclear why this is necessary; the unmount calls
actually write to the separate mountpoints.json file, with a separate lock.

When this was originally introduced in b046fb5 ,
there wasn't a separate mountpoints.json file, and store.go was manually
calling Touch() everywhere; so my best guess is that this is just an
artifact of making those two API changes, and the Touch() is not actually
necessary.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
@nalind
Copy link
Member

nalind commented Oct 14, 2022

That does look like a relic from the past. Removing it LGTM.

@rhatdan rhatdan merged commit ebf857f into containers:main Oct 14, 2022
@mtrmac mtrmac deleted the shutdown-touch branch October 17, 2022 14:27
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.

None yet

4 participants