Tablet repair: core implementation

.github/cfg/integration-test-core.yaml

@@ -93,6 +93,9 @@ jobs:
       - name: Run tests
         run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair
 
+      - name: Run tablet repair tests
+        run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair/tablet
+
   small-pkg:
     name: Test other, smaller packages
     runs-on: ubuntu-latest

.github/workflows/integration-tests-2024.1.21-IPV4.yaml

@@ -40,6 +40,8 @@ jobs:
                 tablets: ${{ env.tablets }}
             - name: Run tests
               run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair
+            - name: Run tablet repair tests
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair/tablet
     restore-schema:
         name: Test restore schema
         runs-on: ubuntu-latest

.github/workflows/integration-tests-2024.1.21-IPV6-raftschema-nossl.yaml

@@ -40,6 +40,8 @@ jobs:
                 tablets: ${{ env.tablets }}
             - name: Run tests
               run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair
+            - name: Run tablet repair tests
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair/tablet
     restore-schema:
         name: Test restore schema
         runs-on: ubuntu-latest

.github/workflows/integration-tests-2025.1.9-IPV4.yaml

@@ -40,6 +40,8 @@ jobs:
                 tablets: ${{ env.tablets }}
             - name: Run tests
               run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair
+            - name: Run tablet repair tests
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair/tablet
     restore-schema:
         name: Test restore schema
         runs-on: ubuntu-latest

.github/workflows/integration-tests-2025.1.9-IPV6-tablets-nossl.yaml

@@ -40,6 +40,8 @@ jobs:
                 tablets: ${{ env.tablets }}
             - name: Run tests
               run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair
+            - name: Run tablet repair tests
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair/tablet
     restore-schema:
         name: Test restore schema
         runs-on: ubuntu-latest

.github/workflows/integration-tests-2025.2.3-IPV4-tablets-native-rclone.yaml

@@ -42,6 +42,8 @@ jobs:
                 tablets: ${{ env.tablets }}
             - name: Run tests
               run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair
+            - name: Run tablet repair tests
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair/tablet
     restore-schema:
         name: Test restore schema
         runs-on: ubuntu-latest

.github/workflows/integration-tests-2025.2.3-IPV6-nossl-rclone-rclone.yaml

@@ -42,6 +42,8 @@ jobs:
                 tablets: ${{ env.tablets }}
             - name: Run tests
               run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair
+            - name: Run tablet repair tests
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair/tablet
     restore-schema:
         name: Test restore schema
         runs-on: ubuntu-latest

.github/workflows/integration-tests-2025.3.3-IPV4-tablets-rclone-native.yaml

@@ -42,6 +42,8 @@ jobs:
                 tablets: ${{ env.tablets }}
             - name: Run tests
               run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair
+            - name: Run tablet repair tests
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair/tablet
     restore-schema:
         name: Test restore schema
         runs-on: ubuntu-latest

.github/workflows/integration-tests-2025.3.3-IPV6-nossl-rclone-rclone.yaml

@@ -42,6 +42,8 @@ jobs:
                 tablets: ${{ env.tablets }}
             - name: Run tests
               run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair
+            - name: Run tablet repair tests
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair/tablet
     restore-schema:
         name: Test restore schema
         runs-on: ubuntu-latest

.github/workflows/integration-tests-2025.4.0-rc4-IPV4-native-native.yaml

@@ -42,6 +42,8 @@ jobs:
                 tablets: ${{ env.tablets }}
             - name: Run tests
               run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair
+            - name: Run tablet repair tests
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair/tablet
     restore-schema:
         name: Test restore schema
         runs-on: ubuntu-latest

.github/workflows/integration-tests-2025.4.0-rc4-IPV6-tablets-nossl-rclone-rclone.yaml

@@ -42,6 +42,8 @@ jobs:
                 tablets: ${{ env.tablets }}
             - name: Run tests
               run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair
+            - name: Run tablet repair tests
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair/tablet
     restore-schema:
         name: Test restore schema
         runs-on: ubuntu-latest

.github/workflows/integration-tests-latest-IPV4-native-native.yaml

@@ -42,6 +42,8 @@ jobs:
                 tablets: ${{ env.tablets }}
             - name: Run tests
               run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair
+            - name: Run tablet repair tests
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair/tablet
     restore-schema:
         name: Test restore schema
         runs-on: ubuntu-latest

.github/workflows/integration-tests-latest-IPV6-tablets-nossl-rclone-rclone.yaml

@@ -42,6 +42,8 @@ jobs:
                 tablets: ${{ env.tablets }}
             - name: Run tests
               run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair
+            - name: Run tablet repair tests
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair/tablet
     restore-schema:
         name: Test restore schema
         runs-on: ubuntu-latest

pkg/cmd/scylla-manager/server.go

@@ -102,6 +102,7 @@ func (s *server) makeServices(ctx context.Context) error {
 		s.session,
 		s.config.Repair,
 		metrics.NewRepairMetrics().MustRegister(),
+		metrics.NewTabletRepairMetrics().MustRegister(),
 		s.clusterSvc.Client,
 		s.clusterSvc.GetSession,
 		s.configCacheSvc,
@@ -177,6 +178,8 @@ func (s *server) makeServices(ctx context.Context) error {
 	s.schedSvc.SetRunner(scheduler.HealthCheckTask, s.healthSvc.Runner())
 	s.schedSvc.SetRunner(scheduler.RepairTask,
 		scheduler.PolicyRunner{Policy: restoreExclusiveLock, Runner: s.repairSvc.Runner(), TaskType: scheduler.RepairTask})
+	s.schedSvc.SetRunner(scheduler.TabletRepairTask,
+		scheduler.PolicyRunner{Policy: restoreExclusiveLock, Runner: s.repairSvc.TabletService, TaskType: scheduler.TabletRepairTask})
 	s.schedSvc.SetRunner(scheduler.ValidateBackupTask, s.backupSvc.ValidationRunner())
 
 	// Add additional properties on task run.

pkg/metrics/tabletrepair.go

@@ -0,0 +1,52 @@
+// Copyright (C) 2025 ScyllaDB
+
+package metrics
+
+import (
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/scylladb/scylla-manager/v3/pkg/util/uuid"
+)
+
+// TabletRepairMetrics describes metrics of tablet repair task.
+type TabletRepairMetrics struct {
+	tableProgress *prometheus.GaugeVec
+}
+
+// NewTabletRepairMetrics creates new TabletRepairMetrics.
+func NewTabletRepairMetrics() TabletRepairMetrics {
+	g := gaugeVecCreator("tablet_repair")
+
+	return TabletRepairMetrics{
+		tableProgress: g("Tablet repair progress in percents (0-100).", "progress", "cluster", "task", "keyspace", "table"),
+	}
+}
+
+func (m TabletRepairMetrics) all() []prometheus.Collector {
+	return []prometheus.Collector{
+		m.tableProgress,
+	}
+}
+
+// MustRegister shall be called to make the metrics visible by prometheus client.
+func (m TabletRepairMetrics) MustRegister() TabletRepairMetrics {
+	prometheus.MustRegister(m.all()...)
+	return m
+}
+
+// ResetClusterMetrics resets all metrics labeled with the cluster.
+func (m TabletRepairMetrics) ResetClusterMetrics(clusterID uuid.UUID) {
+	for _, c := range m.all() {
+		setGaugeVecMatching(c.(*prometheus.GaugeVec), unspecifiedValue, clusterMatcher(clusterID))
+	}
+}
+
+// SetTableProgress updates "progress" metric.
+func (m TabletRepairMetrics) SetTableProgress(clusterID, taskID uuid.UUID, keyspace, table string, progress float64) {
+	l := prometheus.Labels{
+		"cluster":  clusterID.String(),
+		"task":     taskID.String(),
+		"keyspace": keyspace,
+		"table":    table,
+	}
+	m.tableProgress.With(l).Set(progress)
+}

pkg/restapi/services.go

@@ -12,6 +12,7 @@ import (
 	"github.com/scylladb/scylla-manager/v3/pkg/service/healthcheck"
 	"github.com/scylladb/scylla-manager/v3/pkg/service/one2onerestore"
 	"github.com/scylladb/scylla-manager/v3/pkg/service/repair"
+	"github.com/scylladb/scylla-manager/v3/pkg/service/repair/tablet"
 	"github.com/scylladb/scylla-manager/v3/pkg/service/restore"
 	"github.com/scylladb/scylla-manager/v3/pkg/service/scheduler"
 	"github.com/scylladb/scylla-manager/v3/pkg/util/query"
@@ -57,6 +58,9 @@ type RepairService interface {
 	GetTarget(ctx context.Context, clusterID uuid.UUID, properties json.RawMessage) (repair.Target, error)
 	SetIntensity(ctx context.Context, runID uuid.UUID, intensity float64) error
 	SetParallel(ctx context.Context, runID uuid.UUID, parallel int) error
+
+	GetTabletTarget(ctx context.Context, clusterID uuid.UUID, properties json.RawMessage) (tablet.Target, error)
+	GetTabletProgress(ctx context.Context, clusterID, taskID, runID uuid.UUID) (tablet.Progress, error)
 }
 
 // BackupService service interface for the REST API handlers.

pkg/restapi/task.go

@@ -17,6 +17,7 @@ import (
 	"github.com/scylladb/scylla-manager/v3/pkg/service/backup"
 	"github.com/scylladb/scylla-manager/v3/pkg/service/one2onerestore"
 	"github.com/scylladb/scylla-manager/v3/pkg/service/repair"
+	"github.com/scylladb/scylla-manager/v3/pkg/service/repair/tablet"
 	"github.com/scylladb/scylla-manager/v3/pkg/service/restore"
 	"github.com/scylladb/scylla-manager/v3/pkg/service/scheduler"
 	"github.com/scylladb/scylla-manager/v3/pkg/util"
@@ -265,6 +266,10 @@ func (h *taskHandler) validateTask(ctx context.Context, newTask *scheduler.Task,
 		if _, err := h.Repair.GetTarget(ctx, newTask.ClusterID, p); err != nil {
 			return errors.Wrap(err, "create repair target")
 		}
+	case scheduler.TabletRepairTask:
+		if _, err := h.Repair.GetTabletTarget(ctx, newTask.ClusterID, p); err != nil {
+			return errors.Wrap(err, "create tablet repair target")
+		}
 	case scheduler.ValidateBackupTask:
 		if _, err := h.Backup.GetValidationTarget(ctx, newTask.ClusterID, p); err != nil {
 			return errors.Wrap(err, "create backup validation target")
@@ -471,6 +476,8 @@ func (h *taskHandler) taskRunProgress(w http.ResponseWriter, r *http.Request) {
 			switch t.Type {
 			case scheduler.RepairTask:
 				prog.Progress = repair.Progress{}
+			case scheduler.TabletRepairTask:
+				prog.Progress = tablet.Progress{}
 			case scheduler.BackupTask:
 				prog.Progress = backup.Progress{}
 			case scheduler.RestoreTask:
@@ -507,6 +514,8 @@ func (h *taskHandler) taskRunProgress(w http.ResponseWriter, r *http.Request) {
 	switch t.Type {
 	case scheduler.RepairTask:
 		pr, err = h.Repair.GetProgress(r.Context(), t.ClusterID, t.ID, prog.Run.ID)
+	case scheduler.TabletRepairTask:
+		pr, err = h.Repair.GetTabletProgress(r.Context(), t.ClusterID, t.ID, prog.Run.ID)
 	case scheduler.BackupTask:
 		pr, err = h.Backup.GetProgress(r.Context(), t.ClusterID, t.ID, prog.Run.ID)
 	case scheduler.RestoreTask: