Fix naivediffdriver timestamp precision bug #27209
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LK4D4
reviewed
Oct 7, 2016
| @@ -44,6 +44,7 @@ func NewNaiveDiffDriver(driver ProtoDriver, uidMaps, gidMaps []idtools.IDMap) Dr | |||
| // Diff produces an archive of the changes between the specified | |||
| // layer and its parent layer which may be "". | |||
| func (gdw *NaiveDiffDriver) Diff(id, parent string) (arch archive.Archive, err error) { | |||
| startTime := time.Now() | |||
There was a problem hiding this comment.
I'd propose to use time.Now().Truncate(time.Second) here and startTime.Add(time.Second).Sub(time.Now()) in sleep. It looks more understandable to me.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
858d71f to
d1a8305
Compare
|
LGTM |
1 similar comment
|
LGTM |
xproax
reviewed
Jan 5, 2017
| @@ -44,6 +44,7 @@ func NewNaiveDiffDriver(driver ProtoDriver, uidMaps, gidMaps []idtools.IDMap) Dr | |||
| // Diff produces an archive of the changes between the specified | |||
| // layer and its parent layer which may be "". | |||
| func (gdw *NaiveDiffDriver) Diff(id, parent string) (arch archive.Archive, err error) { | |||
| startTime := time.Now() | |||
liusdu
pushed a commit
to liusdu/moby
that referenced
this pull request
Oct 30, 2017
cherry-pick from: moby#27209 Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Signed-off-by: Lei Jitang <leijitang@huawei.com> (cherry picked from commit d1a8305)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #21555
This hack was suggested as a fix 6 months ago and as no better options have been brought up I suggest we merge it. At least temporarily.
Note that this doesn't sleep between every layer, only if there is a chance of this bug happening(very fast write in the beginning of a full second).
Signed-off-by: Tonis Tiigi tonistiigi@gmail.com