feat(ydbcp): support ttl for backups

ydb-platform · Sep 16, 2024 · 06f83e4 · 06f83e4
1 parent 02af8fd
commit 06f83e4
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 2 deletions.
diff --git a/internal/connectors/db/process_result_set.go b/internal/connectors/db/process_result_set.go
@@ -77,6 +77,8 @@ func ReadBackupFromResultSet(res result.Result) (*types.Backup, error) {
 		creator     *string
 		completedAt *time.Time
 		createdAt   *time.Time
+		expireAt    *time.Time
+		expireAtTs  *timestamppb.Timestamp
 	)
 
 	err := res.ScanNamed(
@@ -91,6 +93,7 @@ func ReadBackupFromResultSet(res result.Result) (*types.Backup, error) {
 		named.Optional("status", &status),
 		named.Optional("message", &message),
 		named.Optional("size", &size),
+		named.Optional("expire_at", &expireAt),
 
 		named.Optional("created_at", &createdAt),
 		named.Optional("completed_at", &completedAt),
@@ -100,6 +103,10 @@ func ReadBackupFromResultSet(res result.Result) (*types.Backup, error) {
 		return nil, err
 	}
 
+	if expireAt != nil {
+		expireAtTs = timestamppb.New(*expireAt)
+	}
+
 	return &types.Backup{
 		ID:               backupId,
 		ContainerID:      containerId,
@@ -113,6 +120,7 @@ func ReadBackupFromResultSet(res result.Result) (*types.Backup, error) {
 		Message:          StringOrEmpty(message),
 		AuditInfo:        auditFromDb(creator, createdAt, completedAt),
 		Size:             Int64OrZero(size),
+		ExpireAt:         expireAtTs,
 	}, nil
 }
 

diff --git a/internal/connectors/db/yql/queries/read.go b/internal/connectors/db/yql/queries/read.go
@@ -20,7 +20,7 @@ var (
 		"initiated", "created_at", "completed_at",
 		"s3_endpoint", "s3_region", "s3_bucket",
 		"s3_path_prefix", "status", "paths", "message",
-		"size",
+		"size", "expire_at",
 	}
 	AllOperationFields = []string{
 		"id", "type", "container_id", "database", "endpoint", "backup_id",

diff --git a/internal/connectors/db/yql/queries/write.go b/internal/connectors/db/yql/queries/write.go
@@ -263,6 +263,10 @@ func BuildCreateBackupQuery(b types.Backup, index int) WriteSingleTableQueryImpl
 			d.AddValueParam("$completed_at", table_types.TimestampValueFromTime(b.AuditInfo.CompletedAt.AsTime()))
 		}
 	}
+
+	if b.ExpireAt != nil {
+		d.AddValueParam("$expire_at", table_types.TimestampValueFromTime(b.ExpireAt.AsTime()))
+	}
 	return d
 }
 

diff --git a/internal/server/services/backup/backup_service.go b/internal/server/services/backup/backup_service.go
@@ -217,6 +217,7 @@ func (s *BackupService) MakeBackup(ctx context.Context, req *pb.MakeBackupReques
 		S3Bucket:         s.s3.Bucket,
 		S3PathPrefix:     destinationPrefix,
 		Status:           types.BackupStateRunning,
+		ExpireAt:         nil, // TODO: set ExpireAt based on user backup ttl
 		AuditInfo: &pb.AuditInfo{
 			CreatedAt: now,
 			Creator:   subject,

diff --git a/internal/types/backup.go b/internal/types/backup.go
@@ -2,6 +2,7 @@ package types
 
 import (
 	"fmt"
+	"google.golang.org/protobuf/types/known/timestamppb"
 
 	pb "ydbcp/pkg/proto/ydbcp/v1alpha1"
 
@@ -36,6 +37,7 @@ type Backup struct {
 	Message          string
 	AuditInfo        *pb.AuditInfo
 	Size             int64
+	ExpireAt         *timestamppb.Timestamp
 }
 
 func (o *Backup) String() string {
@@ -65,7 +67,7 @@ func (o *Backup) Proto() *pb.Backup {
 		Size:     o.Size,
 		Status:   pb.Backup_Status(pb.Backup_Status_value[o.Status]),
 		Message:  o.Message,
-		ExpireAt: nil,
+		ExpireAt: o.ExpireAt,
 	}
 }