Inject fallback options into phys restore

Author: boris-ilijic

cmd/pbm-agent/restore.go

@@ -181,7 +181,15 @@ func (a *Agent) Restore(ctx context.Context, r *ctrl.RestoreCmd, opid ctrl.OPID,
 		}
 
 		var rstr *restore.PhysRestore
-		rstr, err = restore.NewPhysical(ctx, a.leadConn, a.nodeConn, nodeInfo, r.RSMap)
+		rstr, err = restore.NewPhysical(
+			ctx,
+			a.leadConn,
+			a.nodeConn,
+			nodeInfo,
+			r.RSMap,
+			r.Fallback,
+			r.AllowPartlyDone,
+		)
 		if err != nil {
 			l.Error("init physical backup: %v", err)
 			return

cmd/pbm/restore.go

@@ -417,6 +417,8 @@ func doRestore(
 			UsersAndRoles:       o.usersAndRoles,
 			RSMap:               rsMapping,
 			External:            o.extern,
+			Fallback:            o.fallback,
+			AllowPartlyDone:     o.allowPartlyDone,
 		},
 	}
 	if o.pitr != "" {

pbm/ctrl/cmd.go

@@ -150,13 +150,15 @@ func (b BackupCmd) String() string {
 }
 
 type RestoreCmd struct {
-	Name          string            `bson:"name"`
-	BackupName    string            `bson:"backupName"`
-	Namespaces    []string          `bson:"nss,omitempty"`
-	NamespaceFrom string            `bson:"nsFrom,omitempty"`
-	NamespaceTo   string            `bson:"nsTo,omitempty"`
-	UsersAndRoles bool              `bson:"usersAndRoles,omitempty"`
-	RSMap         map[string]string `bson:"rsMap,omitempty"`
+	Name            string            `bson:"name"`
+	BackupName      string            `bson:"backupName"`
+	Namespaces      []string          `bson:"nss,omitempty"`
+	NamespaceFrom   string            `bson:"nsFrom,omitempty"`
+	NamespaceTo     string            `bson:"nsTo,omitempty"`
+	UsersAndRoles   bool              `bson:"usersAndRoles,omitempty"`
+	RSMap           map[string]string `bson:"rsMap,omitempty"`
+	Fallback        bool              `bson:"fallbackEnabled"`
+	AllowPartlyDone bool              `bson:"allowPartlyDone"`
 
 	NumParallelColls    *int32 `bson:"numParallelColls,omitempty"`
 	NumInsertionWorkers *int32 `bson:"numInsertionWorkers,omitempty"`

pbm/restore/physical.go

@@ -114,7 +114,9 @@ type PhysRestore struct {
 
 	log log.LogEvent
 
-	rsMap map[string]string
+	rsMap           map[string]string
+	fallback        bool
+	allowPartlyDone bool
 }
 
 func NewPhysical(
@@ -123,6 +125,8 @@ func NewPhysical(
 	node *mongo.Client,
 	inf *topo.NodeInfo,
 	rsMap map[string]string,
+	fallback bool,
+	allowPartlyDone bool,
 ) (*PhysRestore, error) {
 	opts, err := topo.GetMongodOpts(ctx, node, nil)
 	if err != nil {
@@ -178,16 +182,18 @@ func NewPhysical(
 	}
 
 	return &PhysRestore{
-		leadConn: leadConn,
-		node:     node,
-		dbpath:   p,
-		rsConf:   rcf,
-		shards:   shards,
-		cfgConn:  csvr,
-		nodeInfo: inf,
-		tmpPort:  tmpPort,
-		secOpts:  opts.Security,
-		rsMap:    rsMap,
+		leadConn:        leadConn,
+		node:            node,
+		dbpath:          p,
+		rsConf:          rcf,
+		shards:          shards,
+		cfgConn:         csvr,
+		nodeInfo:        inf,
+		tmpPort:         tmpPort,
+		secOpts:         opts.Security,
+		rsMap:           rsMap,
+		fallback:        fallback,
+		allowPartlyDone: allowPartlyDone,
 	}, nil
 }