MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-07 21:02:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: save deleteMarker properly, precision upto UnixNano() (#9843)

Browse Source
This commit is contained in:
Harshavardhana
2020-06-16 07:54:27 -07:00
committed by GitHub
parent cbb7a09376
commit 087aaaf894
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/xl-storage-format-v2.go
View File

@@ -231,7 +231,7 @@ func (z *xlMetaV2) AddVersion(fi FileInfo) error {
Type: DeleteType,
DeleteMarker: &xlMetaV2DeleteMarker{
VersionID: uv,
ModTime: fi.ModTime.Unix(),
ModTime: fi.ModTime.UnixNano(),
},
})
return nil
@@ -262,7 +262,7 @@ func (z *xlMetaV2) AddVersion(fi FileInfo) error {
VersionID: uv,
DataDir: dd,
StatSize: fi.Size,
StatModTime: fi.ModTime.Unix(),
StatModTime: fi.ModTime.UnixNano(),
ErasureAlgorithm: ReedSolomon,
ErasureM: fi.Erasure.DataBlocks,
ErasureN: fi.Erasure.ParityBlocks,
@@ -342,7 +342,7 @@ func (j xlMetaV2DeleteMarker) ToFileInfo(volume, path string) (FileInfo, error)
fi := FileInfo{
Volume: volume,
Name: path,
ModTime: time.Unix(j.ModTime, 0).UTC(),
ModTime: time.Unix(0, j.ModTime).UTC(),
VersionID: uuid.UUID(j.VersionID).String(),
Deleted: true,
}
@@ -360,7 +360,7 @@ func (j xlMetaV2Object) ToFileInfo(volume, path string) (FileInfo, error) {
Volume: volume,
Name: path,
Size: j.StatSize,
ModTime: time.Unix(j.StatModTime, 0).UTC(),
ModTime: time.Unix(0, j.StatModTime).UTC(),
VersionID: versionID,
}
fi.Parts = make([]ObjectPartInfo, len(j.PartNumbers))
@@ -536,9 +536,9 @@ func (z xlMetaV2) ToFileInfo(volume, path, versionID string) (FileInfo, error) {
var modTime time.Time
switch version.Type {
case ObjectType:
modTime = time.Unix(version.ObjectV2.StatModTime, 0)
modTime = time.Unix(0, version.ObjectV2.StatModTime)
case DeleteType:
modTime = time.Unix(version.DeleteMarker.ModTime, 0)
modTime = time.Unix(0, version.DeleteMarker.ModTime)
case LegacyType:
modTime = version.ObjectV1.Stat.ModTime
default: