Skip to content

feat(backup_service): pass SourcePathsToExclude regexp to server side #181

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

Draft
ulya-sidorina wants to merge 1 commit into
base: main
Choose a base branch
from
+31 −28
Draft

feat(backup_service): pass SourcePathsToExclude regexp to server side #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ require (
github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75
github.com/jonboulle/clockwork v0.5.0
github.com/prometheus/client_golang v1.20.4
github.com/prometheus/client_model v0.6.1
github.com/stretchr/testify v1.10.0
github.com/ydb-platform/ydb-go-genproto v0.0.0-20250911135631-b3beddd517d9
github.com/ydb-platform/ydb-go-genproto v0.0.0-20251222105147-0bf751469a4a
github.com/ydb-platform/ydb-go-sdk-prometheus/v2 v2.1.2
github.com/ydb-platform/ydb-go-sdk/v3 v3.108.5
go.uber.org/automaxprocs v1.5.3
Expand All @@ -32,7 +33,6 @@ require (
github.com/klauspost/compress v1.17.10 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.59.1 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
go.uber.org/multierr v1.10.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/ydb-platform/ydb-go-genproto v0.0.0-20250911135631-b3beddd517d9 h1:SKqSRP6/ocY2Z4twOqKEKxpmawVTHTvQiom7hrU6jt0=
github.com/ydb-platform/ydb-go-genproto v0.0.0-20250911135631-b3beddd517d9/go.mod h1:Er+FePu1dNUieD+XTMDduGpQuCPssK5Q4BjF+IIXJ3I=
github.com/ydb-platform/ydb-go-genproto v0.0.0-20251222105147-0bf751469a4a h1:nRqONRrMFulP2bTWM2RRnPM1VDhWuBZg4ULXkG4xXdk=
github.com/ydb-platform/ydb-go-genproto v0.0.0-20251222105147-0bf751469a4a/go.mod h1:Er+FePu1dNUieD+XTMDduGpQuCPssK5Q4BjF+IIXJ3I=
github.com/ydb-platform/ydb-go-sdk-prometheus/v2 v2.1.2 h1:/kDHhXMNGjsqy+SZ3Zn7gZ2ziZekUJLnPXqwy6vyAX8=
github.com/ydb-platform/ydb-go-sdk-prometheus/v2 v2.1.2/go.mod h1:fGsyzk5v4hqteuWNw8liz3iu3xQSRe+zBEdVzyGQy9s=
github.com/ydb-platform/ydb-go-sdk/v3 v3.108.5 h1:h6API3jJKooqBa5MNhBnilscwOMf2xjn+gFhoH56FHk=
Expand Down
23 changes: 12 additions & 11 deletions internal/backup_operations/make_backup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,17 +379,18 @@ func MakeBackup(
}

s3Settings := types.ExportSettings{
Endpoint: s3.Endpoint,
Region: s3.Region,
Bucket: s3.Bucket,
AccessKey: accessKey,
SecretKey: secretKey,
Description: "ydbcp backup", // TODO: the description shoud be better
NumberOfRetries: 10, // TODO: get it from configuration
RootPath: req.RootPath,
SourcePaths: pathsForExport,
DestinationPrefix: destinationPrefix,
S3ForcePathStyle: s3.S3ForcePathStyle,
Endpoint: s3.Endpoint,
Region: s3.Region,
Bucket: s3.Bucket,
AccessKey: accessKey,
SecretKey: secretKey,
Description: "ydbcp backup", // TODO: the description shoud be better
NumberOfRetries: 10, // TODO: get it from configuration
RootPath: req.RootPath,
SourcePaths: pathsForExport,
SourcePathsToExclude: req.SourcePathsToExclude,
DestinationPrefix: destinationPrefix,
S3ForcePathStyle: s3.S3ForcePathStyle,
}

if req.EncryptionSettings != nil {
Expand Down
1 change: 1 addition & 0 deletions internal/connectors/client/connector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@ func (d *ClientYdbConnector) ExportToS3(
if featureFlags.EnableNewPathsFormat {
exportRequest.Settings.SourcePath = path.Join(clientDb.Name(), s3Settings.RootPath)
exportRequest.Settings.DestinationPrefix = s3Settings.DestinationPrefix
exportRequest.Settings.ExcludeRegexps = s3Settings.SourcePathsToExclude
}

if featureFlags.EnableBackupsEncryption && len(s3Settings.EncryptionKey) > 0 {
Expand Down
27 changes: 14 additions & 13 deletions internal/types/settings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,20 @@ func MakeYdbConnectionString(params YdbConnectionParams) string {
}

type ExportSettings struct {
Endpoint string
Region string
Bucket string
AccessKey string
SecretKey string
Description string
NumberOfRetries uint32
RootPath string
SourcePaths []string
DestinationPrefix string
S3ForcePathStyle bool
EncryptionAlgorithm string
EncryptionKey []byte
Endpoint string
Region string
Bucket string
AccessKey string
SecretKey string
Description string
NumberOfRetries uint32
RootPath string
SourcePaths []string
SourcePathsToExclude []string
DestinationPrefix string
S3ForcePathStyle bool
EncryptionAlgorithm string
EncryptionKey []byte
}

type ImportSettings struct {
Expand Down