Skip to content

Commit 1bc2a12

Browse files
ulya-sidorinaulya-sidorina
authored
refactor(config): remove old format fields (#174)
1 parent 6fb3b83 commit 1bc2a12

File tree

9 files changed

+46
-107
lines changed

9 files changed

+46
-107
lines changed

‎cmd/ydbcp/config.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
operation_ttl_seconds: 86400 # 24 hours
2-
31
db_connection:
42
connection_string: "grpcs://localhost:2135/domain/database"
53
insecure: true
@@ -37,3 +35,6 @@ metrics_server:
3735
bind_address: 127.0.0.1
3836
#tls_certificate_path: path/to/tls.crt
3937
#tls_key_path: path/to/tls.key
38+
39+
operation_processor:
40+
operation_ttl_seconds: 86400 # 24 hours

‎cmd/ydbcp/main.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ func main() {
6060
var wg sync.WaitGroup
6161

6262
var logger *xlog.LogConfig
63-
if configInstance.GetDuplicateLogToFile() != "" {
64-
logger, err = xlog.SetupLoggingWithFile(configInstance.GetLogLevel(), configInstance.GetDuplicateLogToFile())
63+
if configInstance.Log.DuplicateToFile != "" {
64+
logger, err = xlog.SetupLoggingWithFile(configInstance.Log.Level, configInstance.Log.DuplicateToFile)
6565
} else {
66-
logger, err = xlog.SetupLogging(configInstance.GetLogLevel())
66+
logger, err = xlog.SetupLogging(configInstance.Log.Level)
6767
}
6868
if err != nil {
6969
log.Error(err)
@@ -116,7 +116,7 @@ func main() {
116116
xlog.Info(ctx, "Initialized AuthProvider")
117117
metrics.InitializeMetricsRegistry(ctx, &wg, &configInstance.MetricsServer, clockwork.NewRealClock())
118118
xlog.Info(ctx, "Initialized metrics registry")
119-
audit.EventsDestination = configInstance.GetAuditEventsDestination()
119+
audit.EventsDestination = configInstance.Audit.EventsDestination
120120
server, err := server.NewServer(&configInstance.GRPCServer, authProvider)
121121
if err != nil {
122122
xlog.Error(ctx, "failed to initialize GRPC server", zap.Error(err))
@@ -199,11 +199,11 @@ func main() {
199199
}
200200

201201
processor.NewOperationProcessor(
202-
ctx, &wg, configInstance.GetProcessorIntervalSeconds(), dbConnector, handlersRegistry,
202+
ctx, &wg, configInstance.OperationProcessor.ProcessorIntervalSeconds, dbConnector, handlersRegistry,
203203
)
204204
xlog.Info(ctx, "Initialized OperationProcessor")
205205

206-
if configInstance.GetDisableTTLDeletion() {
206+
if configInstance.FeatureFlags.DisableTTLDeletion {
207207
xlog.Info(ctx, "TtlWatcher is disabled, old backups won't be deleted")
208208
} else {
209209
ttl_watcher.NewTtlWatcher(ctx, &wg, dbConnector, queries.NewWriteTableQuery)
@@ -213,7 +213,7 @@ func main() {
213213
backupScheduleHandler := handlers.NewBackupScheduleHandler(queries.NewWriteTableQuery, clockwork.NewRealClock())
214214

215215
schedule_watcher.NewScheduleWatcher(
216-
ctx, &wg, configInstance.GetProcessorIntervalSeconds(), dbConnector,
216+
ctx, &wg, configInstance.OperationProcessor.ProcessorIntervalSeconds, dbConnector,
217217
backupScheduleHandler, clockwork.NewRealClock(),
218218
)
219219
xlog.Info(ctx, "Created ScheduleWatcher")

‎internal/config/config.go‎

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ type GRPCServerConfig struct {
5555
BindPort uint16 `yaml:"bind_port" default:"2135"`
5656
TLSCertificatePath string `yaml:"tls_certificate_path"`
5757
TLSKeyPath string `yaml:"tls_key_path"`
58-
LogLevel string `yaml:"log_level" default:"DEBUG"`
5958
}
6059

6160
type MetricsServerConfig struct {
@@ -104,71 +103,6 @@ type Config struct {
104103
Log LogConfig `yaml:"log"`
105104
Quota QuotaConfig `yaml:"quota"`
106105
FeatureFlags FeatureFlagsConfig `yaml:"feature_flags"`
107-
108-
// TODO: remove these fields and their getters after migration to the new config format
109-
OperationTtlSeconds int64 `yaml:"operation_ttl_seconds" default:"86400"`
110-
SchedulesLimitPerDB int `yaml:"schedules_limit_per_db" default:"10"`
111-
ProcessorIntervalSeconds int64 `yaml:"processor_interval_seconds" default:"10"`
112-
DisableTTLDeletion bool `yaml:"disable_ttl_deletion" default:"false"`
113-
AuditEventsDestination string `yaml:"audit_events_destination"`
114-
DuplicateLogToFile string `yaml:"duplicate_log_to_file"`
115-
}
116-
117-
func (c Config) GetOperationTtlSeconds() int64 {
118-
if c.OperationTtlSeconds == 0 {
119-
return c.OperationProcessor.OperationTtlSeconds
120-
}
121-
122-
return c.OperationTtlSeconds
123-
}
124-
125-
func (c *Config) SetOperationTtlSeconds(val int64) {
126-
c.OperationTtlSeconds = val
127-
c.OperationProcessor.OperationTtlSeconds = val
128-
}
129-
130-
func (c Config) GetSchedulesLimitPerDB() int {
131-
if c.SchedulesLimitPerDB == 0 {
132-
return c.Quota.SchedulesPerDB
133-
}
134-
135-
return c.SchedulesLimitPerDB
136-
}
137-
138-
func (c Config) GetProcessorIntervalSeconds() int64 {
139-
if c.ProcessorIntervalSeconds == 0 {
140-
return c.OperationProcessor.ProcessorIntervalSeconds
141-
}
142-
143-
return c.ProcessorIntervalSeconds
144-
}
145-
146-
func (c Config) GetDisableTTLDeletion() bool {
147-
return c.DisableTTLDeletion || c.FeatureFlags.DisableTTLDeletion
148-
}
149-
150-
func (c Config) GetAuditEventsDestination() string {
151-
if len(c.AuditEventsDestination) == 0 {
152-
return c.Audit.EventsDestination
153-
}
154-
155-
return c.AuditEventsDestination
156-
}
157-
158-
func (c Config) GetDuplicateLogToFile() string {
159-
if len(c.DuplicateLogToFile) == 0 {
160-
return c.Log.DuplicateToFile
161-
}
162-
163-
return c.DuplicateLogToFile
164-
}
165-
166-
func (c Config) GetLogLevel() string {
167-
if len(c.GRPCServer.LogLevel) == 0 {
168-
return c.Log.Level
169-
}
170-
171-
return c.GRPCServer.LogLevel
172106
}
173107

174108
type ClusterConnectionConfig struct {

‎internal/handlers/delete_backup_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func TestDBOperationHandlerDeadlineExceededForRunningOperation(t *testing.T) {
5252
s3Connector := s3Client.NewMockS3Connector(s3ObjectsMap)
5353

5454
config := config.Config{}
55-
config.SetOperationTtlSeconds(0)
55+
config.OperationProcessor.OperationTtlSeconds = 0
5656
handler := NewDBOperationHandler(
5757
dbConnector, s3Connector, config, queries.NewWriteTableQueryMock,
5858
)
@@ -124,7 +124,7 @@ func TestDBOperationHandlerPendingOperationCompletedSuccessfully(t *testing.T) {
124124

125125
metrics.InitializeMockMetricsRegistry()
126126
config := config.Config{}
127-
config.SetOperationTtlSeconds(1000)
127+
config.OperationProcessor.OperationTtlSeconds = 1000
128128
handler := NewDBOperationHandler(
129129
dbConnector, s3Connector, config, queries.NewWriteTableQueryMock,
130130
)
@@ -204,7 +204,7 @@ func TestDBOperationHandlerRunningOperationCompletedSuccessfully(t *testing.T) {
204204

205205
metrics.InitializeMockMetricsRegistry()
206206
config := config.Config{}
207-
config.SetOperationTtlSeconds(1000)
207+
config.OperationProcessor.OperationTtlSeconds = 1000
208208
handler := NewDBOperationHandler(
209209
dbConnector, s3Connector, config, queries.NewWriteTableQueryMock,
210210
)
@@ -281,7 +281,7 @@ func TestDBOperationHandlerUnexpectedBackupStatus(t *testing.T) {
281281

282282
s3Connector := s3Client.NewMockS3Connector(s3ObjectsMap)
283283
config := config.Config{}
284-
config.SetOperationTtlSeconds(1000)
284+
config.OperationProcessor.OperationTtlSeconds = 1000
285285
handler := NewDBOperationHandler(
286286
dbConnector, s3Connector, config, queries.NewWriteTableQueryMock,
287287
)
@@ -351,7 +351,7 @@ func TestDBOperationHandlerDeleteMoreThanAllowedLimit(t *testing.T) {
351351

352352
metrics.InitializeMockMetricsRegistry()
353353
config := config.Config{}
354-
config.SetOperationTtlSeconds(1000)
354+
config.OperationProcessor.OperationTtlSeconds = 1000
355355
handler := NewDBOperationHandler(
356356
dbConnector, s3Connector, config, queries.NewWriteTableQueryMock,
357357
)

‎internal/handlers/restore_backup_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ func TestRBOperationHandlerRunningOperationInProgress(t *testing.T) {
133133

134134
// try to handle pending rb operation with ttl
135135
config := config.Config{}
136-
config.SetOperationTtlSeconds(1000)
136+
config.OperationProcessor.OperationTtlSeconds = 1000
137137
handler := NewRBOperationHandler(
138138
dbConnector,
139139
clientConnector,
@@ -187,7 +187,7 @@ func TestRBOperationHandlerRunningOperationCompletedSuccessfully(t *testing.T) {
187187
dbConnector := db.NewMockDBConnector(db.WithOperations(opMap))
188188

189189
config := config.Config{}
190-
config.SetOperationTtlSeconds(1000)
190+
config.OperationProcessor.OperationTtlSeconds = 1000
191191
handler := NewRBOperationHandler(
192192
dbConnector,
193193
clientConnector,
@@ -240,7 +240,7 @@ func TestRBOperationHandlerRunningOperationCancelled(t *testing.T) {
240240
dbConnector := db.NewMockDBConnector(db.WithOperations(opMap))
241241

242242
config := config.Config{}
243-
config.SetOperationTtlSeconds(10)
243+
config.OperationProcessor.OperationTtlSeconds = 10
244244
handler := NewRBOperationHandler(
245245
dbConnector,
246246
clientConnector,
@@ -344,7 +344,7 @@ func TestRBOperationHandlerCancellingOperationInProgress(t *testing.T) {
344344
dbConnector := db.NewMockDBConnector(db.WithOperations(opMap))
345345

346346
config := config.Config{}
347-
config.SetOperationTtlSeconds(1000)
347+
config.OperationProcessor.OperationTtlSeconds = 1000
348348
handler := NewRBOperationHandler(
349349
dbConnector,
350350
clientConnector,
@@ -398,7 +398,7 @@ func TestRBOperationHandlerCancellingOperationCompletedSuccessfully(t *testing.T
398398
dbConnector := db.NewMockDBConnector(db.WithOperations(opMap))
399399

400400
config := config.Config{}
401-
config.SetOperationTtlSeconds(10)
401+
config.OperationProcessor.OperationTtlSeconds = 10
402402
handler := NewRBOperationHandler(
403403
dbConnector,
404404
clientConnector,
@@ -452,7 +452,7 @@ func TestRBOperationHandlerCancellingOperationCancelled(t *testing.T) {
452452
dbConnector := db.NewMockDBConnector(db.WithOperations(opMap))
453453

454454
config := config.Config{}
455-
config.SetOperationTtlSeconds(10)
455+
config.OperationProcessor.OperationTtlSeconds = 10
456456
handler := NewRBOperationHandler(
457457
dbConnector,
458458
clientConnector,
@@ -506,7 +506,7 @@ func TestRBOperationHandlerRetriableErrorForRunningOperation(t *testing.T) {
506506
dbConnector := db.NewMockDBConnector(db.WithOperations(opMap))
507507

508508
config := config.Config{}
509-
config.SetOperationTtlSeconds(10)
509+
config.OperationProcessor.OperationTtlSeconds = 10
510510
handler := NewRBOperationHandler(
511511
dbConnector,
512512
clientConnector,

‎internal/handlers/take_backup_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func TestTBOperationHandlerDeadlineExceededForRunningOperation(t *testing.T) {
115115
s3Connector := s3Client.NewMockS3Connector(s3ObjectsMap)
116116

117117
config := config.Config{}
118-
config.SetOperationTtlSeconds(0)
118+
config.OperationProcessor.OperationTtlSeconds = 0
119119
handler := NewTBOperationHandler(
120120
dbConnector, clientConnector, s3Connector, config, queries.NewWriteTableQueryMock,
121121
)
@@ -187,7 +187,7 @@ func TestTBOperationHandlerRunningOperationInProgress(t *testing.T) {
187187
s3Connector := s3Client.NewMockS3Connector(s3ObjectsMap)
188188

189189
config := config.Config{}
190-
config.SetOperationTtlSeconds(10000)
190+
config.OperationProcessor.OperationTtlSeconds = 10000
191191
handler := NewTBOperationHandler(
192192
dbConnector, clientConnector, s3Connector, config, queries.NewWriteTableQueryMock,
193193
)
@@ -276,7 +276,7 @@ func TestTBOperationHandlerRunningOperationCompletedSuccessfully(t *testing.T) {
276276
s3Connector := s3Client.NewMockS3Connector(s3ObjectsMap)
277277
metrics.InitializeMockMetricsRegistry()
278278
config := config.Config{}
279-
config.SetOperationTtlSeconds(10000)
279+
config.OperationProcessor.OperationTtlSeconds = 10000
280280
handler := NewTBOperationHandler(
281281
dbConnector, clientConnector, s3Connector, config, queries.NewWriteTableQueryMock,
282282
)
@@ -353,7 +353,7 @@ func TestTBOperationHandlerRunningOperationCancelled(t *testing.T) {
353353
s3Connector := s3Client.NewMockS3Connector(s3ObjectsMap)
354354
metrics.InitializeMockMetricsRegistry()
355355
config := config.Config{}
356-
config.SetOperationTtlSeconds(10000)
356+
config.OperationProcessor.OperationTtlSeconds = 10000
357357
handler := NewTBOperationHandler(
358358
dbConnector, clientConnector, s3Connector, config, queries.NewWriteTableQueryMock,
359359
)
@@ -429,7 +429,7 @@ func TestTBOperationHandlerDeadlineExceededForCancellingOperation(t *testing.T)
429429
s3Connector := s3Client.NewMockS3Connector(s3ObjectsMap)
430430
metrics.InitializeMockMetricsRegistry()
431431
config := config.Config{}
432-
config.SetOperationTtlSeconds(0)
432+
config.OperationProcessor.OperationTtlSeconds = 0
433433
handler := NewTBOperationHandler(
434434
dbConnector, clientConnector, s3Connector, config, queries.NewWriteTableQueryMock,
435435
)
@@ -507,7 +507,7 @@ func TestTBOperationHandlerCancellingOperationInProgress(t *testing.T) {
507507
s3Connector := s3Client.NewMockS3Connector(s3ObjectsMap)
508508

509509
config := config.Config{}
510-
config.SetOperationTtlSeconds(10000)
510+
config.OperationProcessor.OperationTtlSeconds = 10000
511511
handler := NewTBOperationHandler(
512512
dbConnector, clientConnector, s3Connector, config, queries.NewWriteTableQueryMock,
513513
)
@@ -595,7 +595,7 @@ func TestTBOperationHandlerCancellingOperationCompletedSuccessfully(t *testing.T
595595
s3Connector := s3Client.NewMockS3Connector(s3ObjectsMap)
596596
metrics.InitializeMockMetricsRegistry()
597597
config := config.Config{}
598-
config.SetOperationTtlSeconds(10000)
598+
config.OperationProcessor.OperationTtlSeconds = 10000
599599
handler := NewTBOperationHandler(
600600
dbConnector, clientConnector, s3Connector, config, queries.NewWriteTableQueryMock,
601601
)
@@ -672,7 +672,7 @@ func TestTBOperationHandlerCancellingOperationCancelled(t *testing.T) {
672672
s3Connector := s3Client.NewMockS3Connector(s3ObjectsMap)
673673
metrics.InitializeMockMetricsRegistry()
674674
config := config.Config{}
675-
config.SetOperationTtlSeconds(10000)
675+
config.OperationProcessor.OperationTtlSeconds = 10000
676676
handler := NewTBOperationHandler(
677677
dbConnector, clientConnector, s3Connector, config, queries.NewWriteTableQueryMock,
678678
)
@@ -764,7 +764,7 @@ func TestTBOperationHandlerCancellingOperationCancelledWithRemovingDataFromS3(t
764764
s3Connector := s3Client.NewMockS3Connector(s3ObjectsMap)
765765
metrics.InitializeMockMetricsRegistry()
766766
config := config.Config{}
767-
config.SetOperationTtlSeconds(10000)
767+
config.OperationProcessor.OperationTtlSeconds = 10000
768768
handler := NewTBOperationHandler(
769769
dbConnector, clientConnector, s3Connector, config, queries.NewWriteTableQueryMock,
770770
)
@@ -845,7 +845,7 @@ func TestTBOperationHandlerRetriableErrorForRunningOperation(t *testing.T) {
845845
s3Connector := s3Client.NewMockS3Connector(s3ObjectsMap)
846846

847847
config := config.Config{}
848-
config.SetOperationTtlSeconds(10000)
848+
config.OperationProcessor.OperationTtlSeconds = 10000
849849
handler := NewTBOperationHandler(
850850
dbConnector, clientConnector, s3Connector, config, queries.NewWriteTableQueryMock,
851851
)

‎internal/handlers/utils.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
)
1919

2020
func deadlineExceeded(createdAt *timestamppb.Timestamp, config config.Config) bool {
21-
return time.Since(createdAt.AsTime()) > time.Duration(config.GetOperationTtlSeconds())*time.Second
21+
return time.Since(createdAt.AsTime()) > time.Duration(config.OperationProcessor.OperationTtlSeconds)*time.Second
2222
}
2323
func isValidStatus(status Ydb.StatusIds_StatusCode) bool {
2424
return status == Ydb.StatusIds_SUCCESS || status == Ydb.StatusIds_CANCELLED

‎internal/server/services/backup_schedule/backup_schedule_service.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,20 +94,20 @@ func (s *BackupScheduleService) CreateBackupSchedule(
9494
return nil, status.Error(codes.Internal, "error getting backup schedules")
9595
}
9696

97-
if len(schedules)+1 > s.config.GetSchedulesLimitPerDB() {
97+
if len(schedules)+1 > s.config.Quota.SchedulesPerDB {
9898
xlog.Error(
9999
ctx, "can't create backup schedule, limit exceeded for database",
100100
zap.String("database", request.DatabaseName),
101101
zap.String("container", request.ContainerId),
102-
zap.Int("limit", s.config.GetSchedulesLimitPerDB()),
102+
zap.Int("limit", s.config.Quota.SchedulesPerDB),
103103
)
104104
s.IncApiCallsCounter(methodName, codes.FailedPrecondition)
105105
return nil, status.Errorf(
106106
codes.FailedPrecondition,
107107
"can't create backup schedule, limit exceeded for database: %s, container: %s, limit: %d",
108108
request.DatabaseName,
109109
request.ContainerId,
110-
s.config.GetSchedulesLimitPerDB(),
110+
s.config.Quota.SchedulesPerDB,
111111
)
112112
}
113113

0 commit comments

Comments
 (0)