Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions pkg/proc/delete_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -171,13 +171,8 @@ func (dh *BasicGarbageMgr) ListDelete2Files(bucket string, msg message.Delete2Me

filesToDelete := make([]*object.ObjectInfo, 0)
for i := range objectMetas {
filename := objectMetas[i].Path
ylogger.Zero.Debug().Str("name", filename).Msg("lookup chunk")
if !strings.HasPrefix(filename, msg.Prefix) {
continue
}
ylogger.Zero.Debug().Str("file", objectMetas[i].Path).
Str("has prefix so will be deleted", msg.Prefix)
Str("will be deleted", msg.Prefix)

filesToDelete = append(filesToDelete, objectMetas[i])

Expand Down
32 changes: 32 additions & 0 deletions pkg/proc/delete_handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,35 @@ func TestTrashPathConversion(t *testing.T) {
assert.Equal(t, tc.Path, resP2)
}
}

func TestListDelete2Files(t *testing.T) {
ctrl := gomock.NewController(t)

msg := message.Delete2Message{
Prefix: "trash",
Garbage: true,
Confirm: true,
}

filesInStorage := []*object.ObjectInfo{
{Path: "1663_16530_not-deleted_18002_"},
{Path: "1663_16530_deleted-after-backup_18002_"},
{Path: "1663_16530_deleted-when-backup-start_18002_"},
{Path: "1663_16530_deleted-before-backup_18002_"},
{Path: "some_trash"},
}
storage := mock.NewMockStorageInteractor(ctrl)
storage.EXPECT().ListBucketPath("", msg.Prefix, true).Return(filesInStorage, nil)

handler := proc.BasicGarbageMgr{
StorageInterractor: storage,
DbInterractor: nil,
BackupInterractor: nil,
Cnf: &config.Vacuum{CheckBackup: true},
}

actualFilesToDelete, err := handler.ListDelete2Files("", msg)
assert.NoError(t, err)
assert.Equal(t, len(filesInStorage), len(actualFilesToDelete))
assert.Equal(t, filesInStorage, actualFilesToDelete)
}
Loading