ctrl: Demote volume if the state is primary

Madhu-1 · Madhu-1 · commit 5c1f953e0c6f · 2021-11-16T13:47:45.000+05:30
Demote the volume only once if the instance
state is primary.

Signed-off-by: Madhu Rajanna &lt;madhupr007@gmail.com&gt;
diff --git a/controllers/volumereplication_controller.go b/controllers/volumereplication_controller.go
@@ -236,11 +236,8 @@ func (r *VolumeReplicationReconciler) Reconcile(ctx context.Context, req ctrl.Re
 				}, nil
 			}
 		} else {
-			replicationErr = r.markVolumeAsSecondary(instance, logger, volumeHandle, replicationHandle, parameters, secret)
-			// resync volume if successfully marked Secondary
-			if replicationErr == nil {
-				requeueForResync, replicationErr = r.resyncVolume(instance, logger, volumeHandle, replicationHandle, parameters, secret)
-			}
+			// resync volume as the volume is already marked Secondary
+			requeueForResync, replicationErr = r.resyncVolume(instance, logger, volumeHandle, replicationHandle, parameters, secret)
 		}
 
 	case replicationv1alpha1.Resync:

Original file line number	Diff line number	Diff line change
`@@ -236,11 +236,8 @@ func (r *VolumeReplicationReconciler) Reconcile(ctx context.Context, req ctrl.Re`
`236`	`236`	`}, nil`
`237`	`237`	`}`
`238`	`238`	`} else {`
`239`		`- replicationErr = r.markVolumeAsSecondary(instance, logger, volumeHandle, replicationHandle, parameters, secret)`
`240`		`- // resync volume if successfully marked Secondary`
`241`		`- if replicationErr == nil {`
`242`		`- requeueForResync, replicationErr = r.resyncVolume(instance, logger, volumeHandle, replicationHandle, parameters, secret)`
`243`		`- }`
	`239`	`+ // resync volume as the volume is already marked Secondary`
	`240`	`+ requeueForResync, replicationErr = r.resyncVolume(instance, logger, volumeHandle, replicationHandle, parameters, secret)`
`244`	`241`	`}`
`245`	`242`
`246`	`243`	`case replicationv1alpha1.Resync:`