Merge branch 'main' into v3

percona · Dec 1, 2023 · 2b250e6 · 2b250e6
1 parent 5aa6e6b
commit 2b250e6
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 38 deletions.
diff --git a/.mockery.yaml b/.mockery.yaml
@@ -57,6 +57,9 @@ packages:
       scheduleService:
       removalService:
       pbmPITRService:
+  github.com/percona/pmm/managed/services/management/dump:
+    interfaces:
+      dumpService:
   github.com/percona/pmm/managed/services/qan:
     interfaces:
       qanCollectorClient:

diff --git a/api/serverpb/server.pb.go b/api/serverpb/server.pb.go
diff --git a/api/serverpb/server_grpc.pb.go b/api/serverpb/server_grpc.pb.go
diff --git a/managed/cmd/pmm-managed/main.go b/managed/cmd/pmm-managed/main.go
@@ -982,6 +982,8 @@ func main() { //nolint:cyclop,maintidx
 	schedulerService := scheduler.New(db, backupService)
 	versionCache := versioncache.New(db, versioner)
 
+	dumpService := dump.New(db)
+
 	serverParams := &server.Params{
 		DB:                   db,
 		VMDB:                 vmdb,
@@ -1154,7 +1156,6 @@ func main() { //nolint:cyclop,maintidx
 				versionCache:         versionCache,
 				vmalert:              vmalert,
 				vmClient:             &vmClient,
-				vmalert:              vmalert,
 				vmdb:                 vmdb,
 			})
 	}()
@@ -1176,7 +1177,8 @@ func main() { //nolint:cyclop,maintidx
 
 	haService.AddLeaderService(ha.NewContextService("cleaner", func(ctx context.Context) error {
 		cleaner.Run(ctx, cleanInterval, cleanOlderThan)
-	}()
+		return nil
+	}))
 
 	wg.Add(1)
 	go func() {

diff --git a/managed/models/database.go b/managed/models/database.go
@@ -948,6 +948,7 @@ var databaseSchema = [][]string{
 			FOREIGN KEY (dump_id) REFERENCES dumps (id) ON DELETE CASCADE,
 			PRIMARY KEY (dump_id, chunk_id)
 		)`,
+	},
 	100: {
 		`DROP TABLE kubernetes_clusters`,
 	},

diff --git a/managed/services/management/dump/deps.go b/managed/services/management/dump/deps.go
@@ -17,8 +17,6 @@ package dump
 
 import "github.com/percona/pmm/managed/services/dump"
 
-//go:generate ../../../../bin/mockery --name=dumpService --case=snake --inpackage --testonly
-
 type dumpService interface {
 	StartDump(params *dump.Params) (string, error)
 	DeleteDump(dumpID string) error

diff --git a/managed/services/management/dump/mock_dump_service_test.go b/managed/services/management/dump/mock_dump_service_test.go
diff --git a/managed/services/server/server.go b/managed/services/server/server.go
@@ -60,6 +60,7 @@ type Server struct {
 	telemetryService     telemetryService
 	awsInstanceChecker   *AWSInstanceChecker
 	grafanaClient        grafanaClient
+	haService            haService
 
 	l *logrus.Entry