schedule planning

api/metastore/v1/raft_log/raft_log.proto

@@ -44,16 +44,25 @@ message CompactionPlanUpdate {
 message CompactionJobState {
   string name = 1;
   uint32 compaction_level = 2;
-
   metastore.v1.CompactionJobStatus status = 3;
+
   uint64 raft_log_index = 4;
   int64 lease_expires_at = 5;
   int64 failures = 6;
   int64 added_at = 7;
 
   // Only present if the status is SUCCESS.
-  repeated metastore.v1.BlockMeta compacted_blocks = 8;
-  repeated string deleted_blocks = 9;
+  CompactedBlocks compacted_blocks = 8;
+}
+
+message CompactedBlocks {
+  string job_name = 1;
+  string tenant = 2;
+  uint32 shard = 3;
+  uint32 compaction_level = 4;
+  repeated string source_blocks = 5;
+  repeated metastore.v1.BlockMeta compacted_blocks = 6;
+  repeated string deleted_blocks = 7;
 }
 
 // UpdateCompactionPlanRequest proposes compaction plan changes.

pkg/experiment/metastore/compaction/compaction.go

@@ -10,31 +10,23 @@ import (
 
 type Planner interface {
 	AddBlocks(*bbolt.Tx, *raft.Log, ...*metastorev1.BlockMeta) error
-	Planned(*bbolt.Tx, *metastorev1.CompactionJob) error
-	Compacted(*bbolt.Tx, CompactedBlocks) error
 	NewPlan(*bbolt.Tx) Plan
+	// Planned and Compacted methods is the way Scheduler communicates to planner.
+	Planned(*bbolt.Tx, *metastorev1.CompactionJob) error
+	Compacted(*bbolt.Tx, *raft_log.CompactedBlocks) error
 }
 
 type Plan interface {
 	CreateJob() *metastorev1.CompactionJob
 }
 
 type Scheduler interface {
-	AddJobs(*bbolt.Tx, ...*metastorev1.CompactionJob) error
-	UpdateSchedule(*bbolt.Tx, ...*raft_log.CompactionJobState) error
+	AddJobs(*bbolt.Tx, Planner, ...*metastorev1.CompactionJob) error
+	UpdateSchedule(*bbolt.Tx, Planner, ...*raft_log.CompactionJobState) error
 	NewSchedule(*bbolt.Tx, *raft.Log) Schedule
 }
 
 type Schedule interface {
 	UpdateJob(*metastorev1.CompactionJobStatusUpdate) *raft_log.CompactionJobState
 	AssignJob() (*metastorev1.CompactionJob, *raft_log.CompactionJobState)
 }
-
-type CompactedBlocks struct {
-	Tenant  string
-	Shard   uint32
-	Level   uint32
-	Source  []string
-	Deleted []string
-	Blocks  []*metastorev1.BlockMeta
-}