updates

Author: veceraj

cmd/pbm-agent/delete.go

@@ -297,7 +297,7 @@ func (a *Agent) Cleanup(ctx context.Context, d *ctrl.CleanupCmd, opid ctrl.OPID,
 		l.Error(err.Error())
 	}
 
-	err = resync.Resync(ctx, a.leadConn, &cfg.Storage, a.brief.Me)
+	err = resync.Resync(ctx, a.leadConn, &cfg.Storage, a.brief.Me, false)
 	if err != nil {
 		l.Error("storage resync: " + err.Error())
 	}

cmd/pbm-agent/resync.go

@@ -71,7 +71,7 @@ func (a *Agent) Resync(ctx context.Context, cmd *ctrl.ResyncCmd, opid ctrl.OPID,
 	} else if cmd.Name != "" {
 		err = a.handleSyncProfile(ctx, cmd.Name, cmd.Clear)
 	} else {
-		err = a.handleSyncMainStorage(ctx)
+		err = a.handleSyncMainStorage(ctx, cmd.SkipRestores)
 	}
 	if err != nil {
 		l.Error(err.Error())
@@ -134,13 +134,13 @@ func (a *Agent) helpSyncProfileBackups(ctx context.Context, profile *config.Conf
 	return errors.Wrapf(err, "sync backup list for %q", profile.Name)
 }
 
-func (a *Agent) handleSyncMainStorage(ctx context.Context) error {
+func (a *Agent) handleSyncMainStorage(ctx context.Context, skipRestores bool) error {
 	cfg, err := config.GetConfig(ctx, a.leadConn)
 	if err != nil {
 		return errors.Wrap(err, "get config")
 	}
 
-	err = resync.Resync(ctx, a.leadConn, &cfg.Storage, a.brief.Me)
+	err = resync.Resync(ctx, a.leadConn, &cfg.Storage, a.brief.Me, skipRestores)
 	if err != nil {
 		return errors.Wrap(err, "resync")
 	}

cmd/pbm/config.go

@@ -77,7 +77,7 @@ func runConfig(
 			}
 		}
 		if rsnc {
-			if _, err := pbm.SyncFromStorage(ctx); err != nil {
+			if _, err := pbm.SyncFromStorage(ctx, false); err != nil {
 				return nil, errors.Wrap(err, "resync")
 			}
 		}
@@ -92,7 +92,7 @@ func runConfig(
 		}
 		return confKV{c.key, fmt.Sprint(k)}, nil
 	case c.rsync:
-		cid, err := pbm.SyncFromStorage(ctx)
+		cid, err := pbm.SyncFromStorage(ctx, c.skipRestores)
 		if err != nil {
 			return nil, errors.Wrap(err, "resync")
 		}
@@ -144,7 +144,7 @@ func runConfig(
 
 		// resync storage only if Storage options have changed
 		if !reflect.DeepEqual(newCfg.Storage, oldCfg.Storage) {
-			if _, err := pbm.SyncFromStorage(ctx); err != nil {
+			if _, err := pbm.SyncFromStorage(ctx, false); err != nil {
 				return nil, errors.Wrap(err, "resync")
 			}
 		}