command/flag: add retry-wait to task

pkg/command/flag/flag.go

@@ -141,6 +141,10 @@ func (w Wrapper) numRetries(p *int, def int) {
 	w.fs.IntVarP(p, "num-retries", "r", def, usage["num-retries"])
 }
 
+func (w Wrapper) retryWait(p *Duration) {
+	w.fs.Var(p, "retry-wait", usage["retry-wait"])
+}
+
 func (w Wrapper) MustMarkDeprecated(name, usageMessage string) {
 	if err := w.fs.MarkDeprecated(name, usageMessage); err != nil {
 		panic(err)

pkg/command/flag/task.go

@@ -3,6 +3,8 @@
 package flag
 
 import (
+	"time"
+
 	"github.com/scylladb/scylla-manager/pkg/managerclient"
 	"github.com/spf13/cobra"
 )
@@ -18,19 +20,20 @@ type TaskBase struct {
 	interval   Duration
 	startDate  Time
 	numRetries int
+	retryWait  Duration
 }
 
 func MakeTaskBase() TaskBase {
-	return TaskBase{}
+	return TaskBase{
+		retryWait: DurationWithDefault(10 * time.Minute),
+	}
 }
 
 func NewUpdateTaskBase() TaskBase {
-	return TaskBase{
-		Command: cobra.Command{
-			Args: cobra.MaximumNArgs(1),
-		},
-		update: true,
-	}
+	base := MakeTaskBase()
+	base.Command.Args = cobra.MaximumNArgs(1)
+	base.update = true
+	return base
 }
 
 func (cmd *TaskBase) Init() {
@@ -41,6 +44,7 @@ func (cmd *TaskBase) Init() {
 	w.interval(&cmd.interval)
 	w.startDate(&cmd.startDate)
 	w.numRetries(&cmd.numRetries, cmd.numRetries)
+	w.retryWait(&cmd.retryWait)
 }
 
 // Update allows differentiating instances created with NewUpdateTaskBase.
@@ -59,6 +63,7 @@ func (cmd *TaskBase) CreateTask(taskType string) *managerclient.Task {
 			Interval:   cmd.interval.String(),
 			StartDate:  cmd.startDate.DateTimePtr(),
 			NumRetries: int64(cmd.numRetries),
+			RetryWait:  cmd.retryWait.String(),
 		},
 		Properties: make(map[string]interface{}),
 	}
@@ -91,5 +96,9 @@ func (cmd *TaskBase) UpdateTask(task *managerclient.Task) bool {
 		task.Schedule.NumRetries = int64(cmd.numRetries)
 		ok = true
 	}
+	if cmd.Flag("retry-wait").Changed {
+		task.Schedule.RetryWait = cmd.retryWait.String()
+		ok = true
+	}
 	return ok
 }

pkg/command/flag/task.yaml

@@ -35,3 +35,7 @@ start-date: |
 
 num-retries: |
   Number of times a task reruns following a failure.
+
+retry-wait: |
+  Initial exponential backoff `duration` X[h|m|s].
+  With --retry-wait 10m task will wait 10 minutes, 20 minutes and 40 minutes after first, second and third consecutire failure.

pkg/command/flag/type.go

@@ -110,6 +110,13 @@ type Duration struct {
 	v duration.Duration
 }
 
+// DurationWithDefault returns new Duration initialized to a given value.
+func DurationWithDefault(d time.Duration) Duration {
+	return Duration{
+		v: duration.Duration(d),
+	}
+}
+
 var _ flag.Value = (*Duration)(nil)
 
 func (d *Duration) String() string {

swagger/scylla-manager.json

@@ -258,6 +258,9 @@
         "num_retries": {
           "type": "number",
           "format": "int"
+        },
+        "retry_wait": {
+          "type": "string"
         }
       }
     },