oyd
/
minio
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix: rename legacy xl.json to xl.meta properly in ListDir() (#9863)

Browse Source
master
Harshavardhana 5 years ago committed by GitHub
parent e79874f58e
commit 94424e14d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 11 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 21
      cmd/xl-storage.go

21
cmd/xl-storage.go
Unescape View File

@ -742,11 +742,11 @@ func (s *xlStorage) ListDirSplunk(volume, dirPath string, count int) (entries []
return nil, err return nil, err
} }
dirPath = pathJoin(volumeDir, dirPath) dirPathAbs := pathJoin(volumeDir, dirPath)
if count > 0 { if count > 0 {
entries, err = readDirN(dirPath, count) entries, err = readDirN(dirPathAbs, count)
} else { } else {
entries, err = readDir(dirPath) entries, err = readDir(dirPathAbs)
} }
if err != nil { if err != nil {
return nil, err return nil, err
@ -756,13 +756,13 @@ func (s *xlStorage) ListDirSplunk(volume, dirPath string, count int) (entries []
if entry != receiptJSON { if entry != receiptJSON {
continue continue
} }
_, err = os.Stat(pathJoin(dirPath, entry, xlStorageFormatFile)) _, err = os.Stat(pathJoin(dirPathAbs, entry, xlStorageFormatFile))
if err == nil { if err == nil {
entries[i] = strings.TrimSuffix(entry, SlashSeparator) entries[i] = strings.TrimSuffix(entry, SlashSeparator)
continue continue
} }
if os.IsNotExist(err) { if os.IsNotExist(err) {
if err = s.renameLegacyMetadata(volume, entry); err == nil { if err = s.renameLegacyMetadata(volume, pathJoin(dirPath, entry)); err == nil {
// Rename was successful means we found old `xl.json` // Rename was successful means we found old `xl.json`
entries[i] = strings.TrimSuffix(entry, SlashSeparator) entries[i] = strings.TrimSuffix(entry, SlashSeparator)
} }
@ -1033,27 +1033,26 @@ func (s *xlStorage) ListDir(volume, dirPath string, count int) (entries []string
return nil, err return nil, err
} }
dirPath = pathJoin(volumeDir, dirPath) dirPathAbs := pathJoin(volumeDir, dirPath)
if count > 0 { if count > 0 {
entries, err = readDirN(dirPath, count) entries, err = readDirN(dirPathAbs, count)
} else { } else {
entries, err = readDir(dirPath) entries, err = readDir(dirPathAbs)
} }
if err != nil { if err != nil {
return nil, err return nil, err
} }
for i, entry := range entries { for i, entry := range entries {
_, err = os.Stat(pathJoin(dirPath, entry, xlStorageFormatFile)) _, err = os.Stat(pathJoin(dirPathAbs, entry, xlStorageFormatFile))
if err == nil { if err == nil {
entries[i] = strings.TrimSuffix(entry, SlashSeparator) entries[i] = strings.TrimSuffix(entry, SlashSeparator)
continue continue
} }
if os.IsNotExist(err) { if os.IsNotExist(err) {
if err = s.renameLegacyMetadata(volume, entry); err == nil { if err = s.renameLegacyMetadata(volume, pathJoin(dirPath, entry)); err == nil {
// if rename was successful, means we did find old `xl.json` // if rename was successful, means we did find old `xl.json`
entries[i] = strings.TrimSuffix(entry, SlashSeparator) entries[i] = strings.TrimSuffix(entry, SlashSeparator)
continue
} }
} }
} }

Write Preview
Loading…
Cancel
Save