MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-02-09 12:48:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: ignore lost+found properly while reading disks (#9278)

Browse Source 
Fixes #9277
This commit is contained in:
Harshavardhana 2020-04-06 16:51:18 -07:00 committed by GitHub
parent 43a3778b45
commit 91f21ddc47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cmd/format-xl.go
View File

@ -378,22 +378,23 @@ func saveFormatXL(disk StorageAPI, format interface{}, diskID string) error {
return nil return nil
} }
var ignoredHiddenDirectories = []string{ var ignoredHiddenDirectories = map[string]struct{}{
minioMetaBucket, minioMetaBucket: {},
".snapshot", ".snapshot": {},
"lost+found", "lost+found": {},
"$RECYCLE.BIN", "$RECYCLE.BIN": {},
"System Volume Information", "System Volume Information": {},
} }
func isIgnoreHiddenDirectories(dir string) bool { func isHiddenDirectories(vols ...VolInfo) bool {
for _, ignDir := range ignoredHiddenDirectories { for _, vol := range vols {
if dir == ignDir { if _, ok := ignoredHiddenDirectories[vol.Name]; ok {
return true continue
}
} }
return false return false
} }
return true
}
// loadFormatXL - loads format.json from disk. // loadFormatXL - loads format.json from disk.
func loadFormatXL(disk StorageAPI) (format *formatXLV3, err error) { func loadFormatXL(disk StorageAPI) (format *formatXLV3, err error) {
@ -407,9 +408,8 @@ func loadFormatXL(disk StorageAPI) (format *formatXLV3, err error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
if len(vols) > 1 || (len(vols) == 1 && !isIgnoreHiddenDirectories(vols[0].Name)) { if !isHiddenDirectories(vols...) {
// 'format.json' not found, but we // 'format.json' not found, but we found user data, reject such disks.
// found user data.
return nil, errCorruptedFormat return nil, errCorruptedFormat
} }
// No other data found, its a fresh disk. // No other data found, its a fresh disk.