Merge pull request #179 from ELENAGER/bug_2249462_long_fencing_backport

ShyamsundarR · web-flow · commit 90e3ce1da677 · 2024-01-25T09:25:42.000-05:00
Bug 2249462: Fencing takes more time than expected
diff --git a/controllers/drcluster_controller.go b/controllers/drcluster_controller.go
@@ -719,7 +719,7 @@ func (u *drclusterInstance) fenceClusterOnCluster(peerCluster *ramen.DRCluster)
 	}
 
 	annotations := make(map[string]string)
-	annotations[DRPCNameAnnotation] = u.object.Name // ?
+	annotations[DRClusterNameAnnotation] = u.object.Name
 
 	nf, err := u.reconciler.MCVGetter.GetNFFromManagedCluster(u.object.Name,
 		u.object.Namespace, peerCluster.Name, annotations)

Original file line number	Diff line number	Diff line change
`@@ -719,7 +719,7 @@ func (u drclusterInstance) fenceClusterOnCluster(peerCluster ramen.DRCluster)`
`719`	`719`	`}`
`720`	`720`
`721`	`721`	`annotations := make(map[string]string)`
`722`		`- annotations[DRPCNameAnnotation] = u.object.Name // ?`
	`722`	`+ annotations[DRClusterNameAnnotation] = u.object.Name`
`723`	`723`
`724`	`724`	`nf, err := u.reconciler.MCVGetter.GetNFFromManagedCluster(u.object.Name,`
`725`	`725`	`u.object.Namespace, peerCluster.Name, annotations)`