Use internal/replication/driver.Do directly

internal/daemon/job/active.go

@@ -17,7 +17,6 @@ import (
 	"github.com/dsh2dsh/zrepl/internal/daemon/snapper"
 	"github.com/dsh2dsh/zrepl/internal/endpoint"
 	"github.com/dsh2dsh/zrepl/internal/logger"
-	"github.com/dsh2dsh/zrepl/internal/replication"
 	"github.com/dsh2dsh/zrepl/internal/replication/driver"
 	"github.com/dsh2dsh/zrepl/internal/replication/logic"
 	"github.com/dsh2dsh/zrepl/internal/replication/report"
@@ -739,7 +738,7 @@ func (j *ActiveSide) replicate(ctx context.Context) error {
 	sender, receiver := j.mode.SenderReceiver()
 	j.updateTasks(func(tasks *activeSideTasks) {
 		tasks.state = ActiveSideReplicating
-		tasks.replicationReport, repWait = replication.Do(
+		tasks.replicationReport, repWait = driver.Do(
 			ctx, j.replicationDriverConfig, logic.NewPlanner(
 				j.promRepStateSecs, j.promBytesReplicated, sender, receiver,
 				j.mode.PlannerPolicy()))

internal/replication/driver/replication_driver.go

@@ -13,6 +13,7 @@ import (
 
 	"github.com/dsh2dsh/zrepl/internal/config"
 	"github.com/dsh2dsh/zrepl/internal/daemon/job/signal"
+	"github.com/dsh2dsh/zrepl/internal/daemon/logging"
 	"github.com/dsh2dsh/zrepl/internal/logger"
 	"github.com/dsh2dsh/zrepl/internal/replication/report"
 	"github.com/dsh2dsh/zrepl/internal/util/chainlock"
@@ -327,6 +328,10 @@ func Do(ctx context.Context, config Config, planner Planner) (ReportFunc,
 	return report, wait
 }
 
+func getLog(ctx context.Context) *slog.Logger {
+	return logging.GetLogger(ctx, logging.SubsysReplication)
+}
+
 func (a *attempt) do(ctx context.Context, prev *attempt) {
 	prevs := a.doGlobalPlanning(ctx, prev)
 	if prevs == nil {
@@ -828,14 +833,23 @@ func (s *step) report() *report.StepReport {
 	return r
 }
 
-//go:generate enumer -type=errorClass
 type errorClass int
 
 const (
 	errorClassPermanent errorClass = iota
 	errorClassTemporaryConnectivityRelated
 )
 
+func (self errorClass) String() string {
+	switch self {
+	case errorClassPermanent:
+		return "errorClassPermanent"
+	case errorClassTemporaryConnectivityRelated:
+		return "errorClassTemporaryConnectivityRelated"
+	}
+	return fmt.Sprintf("errorClass(%d)", self)
+}
+
 type errorReport struct {
 	flattened []*timedError
 	// sorted DESCending by err time