Skip to content

Preserve yezzey storage class in two-stage delete #212

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

Merged
reshke merged 4 commits into from
Aug 17, 2026
Merged

Preserve yezzey storage class in two-stage delete #212

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
088c339
Preserve yezzey storage class in two-stage delete
reshke Aug 15, 2026
c4aefc6
f
reshke Aug 17, 2026
1acb101
f
reshke Aug 17, 2026
2729153
f
reshke Aug 17, 2026
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
19 changes: 15 additions & 4 deletions pkg/storage/s3storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func (s *S3StorageInteractor) CatFileFromStorage(name string, offset int64, sett
return nil, err
}
input := &s3.GetObjectInput{
Bucket: &bucket,
Bucket: aws.String(bucket),
Key: aws.String(objectPath),
Range: aws.String(fmt.Sprintf("bytes=%d-", offset)),
}
Expand Down Expand Up @@ -346,14 +346,25 @@ func (s *S3StorageInteractor) SScopyObject(from, to, fromStoragePrefix, fromStor
to = path.Join(s.cnf.StoragePrefix, to)
}
to = strings.TrimLeft(to, "/")

sourceInput := &s3.HeadObjectInput{
Bucket: aws.String(fromStorageBucket),
Key: aws.String(from),
}
sourceObject, err := sess.HeadObject(sourceInput)
if err != nil {
return err
}

from = path.Join(fromStorageBucket, from)

ylogger.Zero.Debug().Str("to", to).Str("from", from).Msg("requesting server-side copy")

inp := s3.CopyObjectInput{
Bucket: &toStorageBucket,
CopySource: aws.String(from),
Key: aws.String(to),
Bucket: &toStorageBucket,
CopySource: aws.String(from),
Key: aws.String(to),
StorageClass: sourceObject.StorageClass,
}

_, err = sess.CopyObject(&inp)
Expand Down
4 changes: 4 additions & 0 deletions test/regress/expected/12_delete_garbage_preserve_storage_class.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
1
Object: {Name: "/red_red_file", size: 13}
Object: {Name: "/trash/segments_005/seg0/basebackups_005/yezzey/red_red_file", size: 13}
Storage: REDUCED_REDUNDANCY
9 changes: 9 additions & 0 deletions test/regress/tests/12_delete_garbage_preserve_storage_class.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash
set -ex

echo 'garbage data' | yp-client --config test/regress/conf/yproxy_vacuum.yaml -l fatal put --storage-class REDUCED_REDUNDANCY 'red_red_file'
yp-client --config test/regress/conf/yproxy_vacuum.yaml -l fatal list ''
yp-client --config test/regress/conf/yproxy_vacuum.yaml -l fatal delete --garbage --confirm --port 5432 --segnum 0 'red_red_file'
yp-client --config test/regress/conf/yproxy_vacuum.yaml -l fatal list ''

s3cmd --access_key some_key --secret_key some_key --host minio:9000 --host-bucket '' --no-ssl info s3://gpyezzey/trash/segments_005/seg0/basebackups_005/yezzey/red_red_file | grep Storage