Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed the removal of bloat files after vacuum full #68

Merged
merged 4 commits into from
Oct 22, 2024
Merged

Fixed the removal of bloat files after vacuum full #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
becde9b
Fixed the removal of bloat files after vacuum full
visill Oct 18, 2024
b37e08e
Fix import in test
visill Oct 18, 2024
6729475
simplifying logic (removed the ReworkFileName function)
visill Oct 22, 2024
0f8873d
remove ReworkFileName
visill Oct 22, 2024
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
8 changes: 1 addition & 7 deletions pkg/database/database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package database

import (
"fmt"
"strings"

"github.com/jackc/pgx"
"github.com/jackc/pgx/pgtype"
Expand Down Expand Up @@ -81,12 +80,7 @@ func (database *DatabaseHandler) GetVirtualExpireIndexes(port uint64) (map[strin
if err := rows2.Scan(&xpath); err != nil {
return nil, nil, fmt.Errorf("unable to parse query output %v", err)
}
p1 := strings.Split(xpath, "/")
p2 := p1[len(p1)-1]
p3 := strings.Split(p2, "_")
if len(p3) >= 4 {
p2 = fmt.Sprintf("%s_%s_%s_%s_", p3[0], p3[1], p3[2], p3[3])
}
p2 := xpath
c2[p2] = true
ylogger.Zero.Debug().Str("file", p2).Msg("added")
}
Expand Down
14 changes: 2 additions & 12 deletions pkg/proc/delete_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func (dh *BasicDeleteHandler) HandleDeleteGarbage(msg message.DeleteMessage) err
func (dh *BasicDeleteHandler) HandleDeleteFile(msg message.DeleteMessage) error {
err := dh.StorageInterractor.DeleteObject(msg.Name)
if err != nil {
ylogger.Zero.Error().AnErr("err", err).Msg("failed to delete file")
ylogger.Zero.Error().AnErr("err", err).Msg("failed to delete file " + msg.Name)
return errors.Wrap(err, "failed to delete file")
}
return nil
Expand Down Expand Up @@ -134,7 +134,7 @@ func (dh *BasicDeleteHandler) ListGarbageFiles(msg message.DeleteMessage) ([]str

filesToDelete := make([]string, 0)
for i := 0; i < len(objectMetas); i++ {
reworkedName := ReworkFileName(objectMetas[i].Path)
reworkedName := objectMetas[i].Path
ylogger.Zero.Debug().Str("reworked name", reworkedName).Msg("lookup chunk")

if vi[reworkedName] {
Expand All @@ -156,13 +156,3 @@ func (dh *BasicDeleteHandler) ListGarbageFiles(msg message.DeleteMessage) ([]str

return filesToDelete, nil
}

func ReworkFileName(str string) string {
p1 := strings.Split(str, "/")
p2 := p1[len(p1)-1]
p3 := strings.Split(p2, "_")
if len(p3) >= 4 {
p2 = fmt.Sprintf("%s_%s_%s_%s_", p3[0], p3[1], p3[2], p3[3])
}
return p2
}
39 changes: 0 additions & 39 deletions pkg/proc/delete_handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,45 +12,6 @@ import (
"go.uber.org/mock/gomock"
)

func TestReworkingName(t *testing.T) {
type TestCase struct {
input string
expected string
}

testCases := []TestCase{
{
input: "/segments_005/seg1/basebackups_005/yezzey/1663_16530_a4c5ad8305b83f07200b020694c36563_17660_1__DY_1_xlog_19649822496",
expected: "1663_16530_a4c5ad8305b83f07200b020694c36563_17660_",
},
{
input: "1663_16530_a4c5ad8305b83f07200b020694c36563_17660_1__DY_1_xlog_19649822496",
expected: "1663_16530_a4c5ad8305b83f07200b020694c36563_17660_",
},
{
input: "seg1/basebackups_005/yezzey/1663_16530_a4c5ad8305b83f07200b020694c36563_17660_1__DY_1_xlog_19649822496",
expected: "1663_16530_a4c5ad8305b83f07200b020694c36563_17660_",
},
{
input: "1663_16530_a4c5ad8305b83f07200b020694c36563",
expected: "1663_16530_a4c5ad8305b83f07200b020694c36563",
},
{
input: "1663___a4c5ad8305b83f07200b020694c36563___",
expected: "1663___a4c5ad8305b83f07200b020694c36563_",
},
{
input: "file",
expected: "file",
},
}

for _, testCase := range testCases {
ans := proc.ReworkFileName(testCase.input)
assert.Equal(t, testCase.expected, ans)
}
}

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

Expand Down
2 changes: 1 addition & 1 deletion pkg/proc/interaction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ func ProcessCopyExtended(msg message.CopyMessage, s storage.StorageInteractor, c
retryCount++
for i := 0; i < len(objectMetas); i++ {
path := strings.TrimPrefix(objectMetas[i].Path, instanceCnf.StorageCnf.StoragePrefix)
reworked := ReworkFileName(path)
reworked := path
if _, ok := vi[reworked]; !ok {
ylogger.Zero.Debug().Str("object path", objectMetas[i].Path).Msg("not in virtual index, skipping...")
continue
Expand Down
Loading