From 928ee1a7b23b6df7c3f667e02066b28b4b6b103e Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Thu, 8 Apr 2021 19:55:44 -0700 Subject: [PATCH] remove null version dataDir upon overwrites (#12023) --- cmd/xl-storage.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd/xl-storage.go b/cmd/xl-storage.go index 20f3b4251..3d430ff98 100644 --- a/cmd/xl-storage.go +++ b/cmd/xl-storage.go @@ -2041,11 +2041,12 @@ func (s *xlStorage) RenameData(ctx context.Context, srcVolume, srcPath, dataDir, return err } + if oldDstDataPath != "" { + renameAll(oldDstDataPath, pathutil.Join(s.diskPath, minioMetaTmpDeletedBucket, mustGetUUID())) + } + // renameAll only for objects that have xl.meta not saved inline. if len(fi.Data) == 0 && fi.Size > 0 { - if oldDstDataPath != "" { - renameAll(oldDstDataPath, pathutil.Join(s.diskPath, minioMetaTmpDeletedBucket, mustGetUUID())) - } renameAll(dstDataPath, pathutil.Join(s.diskPath, minioMetaTmpDeletedBucket, mustGetUUID())) if err = renameAll(srcDataPath, dstDataPath); err != nil { logger.LogIf(ctx, err)