use db ids of target cluster id during failover

yugabyte · Nov 5, 2024 · f841620 · f841620
1 parent c24aca2
commit f841620
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 11 deletions.
diff --git a/cmd/dr/delete_dr.go b/cmd/dr/delete_dr.go
@@ -51,10 +51,12 @@ var deleteDrCmd = &cobra.Command{
 		if err != nil {
 			logrus.Fatal(err)
 		}
-		drId, clusterId, err := authApi.GetDrDetailsByName(drName)
+		drInfo, err := authApi.GetDrDetailsByName(drName)
 		if err != nil {
 			logrus.Fatal(err)
 		}
+		drId := drInfo.GetId()
+		clusterId := drInfo.GetSourceClusterId()
 
 		r, err := authApi.DeleteXClusterDr(clusterId, drId).Execute()
 		if err != nil {

diff --git a/cmd/dr/describe_dr.go b/cmd/dr/describe_dr.go
@@ -41,10 +41,12 @@ var describeDrCmd = &cobra.Command{
 		if err != nil {
 			logrus.Fatalf("Could not get cluster data: %s", ybmAuthClient.GetApiErrorDetails(err))
 		}
-		drId, clusterId, err := authApi.GetDrDetailsByName(drName)
+		drInfo, err := authApi.GetDrDetailsByName(drName)
 		if err != nil {
 			logrus.Fatal(err)
 		}
+		drId := drInfo.GetId()
+		clusterId := drInfo.GetSourceClusterId()
 		drResp, r, err := authApi.GetXClusterDr(clusterId, drId).Execute()
 		if err != nil {
 			logrus.Debugf("Full HTTP response: %v", r)

diff --git a/cmd/dr/failover_dr.go b/cmd/dr/failover_dr.go
@@ -45,10 +45,12 @@ var failoverDrCmd = &cobra.Command{
 		if err != nil {
 			logrus.Fatalf("Could not get cluster data: %s", ybmAuthClient.GetApiErrorDetails(err))
 		}
-		drId, clusterId, err := authApi.GetDrDetailsByName(drName)
+		drInfo, err := authApi.GetDrDetailsByName(drName)
 		if err != nil {
 			logrus.Fatal(err)
 		}
+		drId := drInfo.GetId()
+		clusterId := drInfo.GetTargetClusterId()
 		namespacesResp, r, err := authApi.GetClusterNamespaces(clusterId).Execute()
 		if err != nil {
 			logrus.Debugf("Full HTTP response: %v", r)

diff --git a/cmd/dr/pause_dr.go b/cmd/dr/pause_dr.go
@@ -43,10 +43,12 @@ var pauseDrCmd = &cobra.Command{
 		if err != nil {
 			logrus.Fatalf("Could not get cluster data: %s", ybmAuthClient.GetApiErrorDetails(err))
 		}
-		drId, clusterId, err := authApi.GetDrDetailsByName(drName)
+		drInfo, err := authApi.GetDrDetailsByName(drName)
 		if err != nil {
 			logrus.Fatal(err)
 		}
+		drId := drInfo.GetId()
+		clusterId := drInfo.GetSourceClusterId()
 
 		pauseDrRequest := ybmclient.NewPauseDrRequestWithDefaults()
 		pauseDrRequest.SetDurationMinutes(durationInMin)

diff --git a/cmd/dr/restart_dr.go b/cmd/dr/restart_dr.go
@@ -44,10 +44,12 @@ var restartDrCmd = &cobra.Command{
 		if err != nil {
 			logrus.Fatalf("Could not get cluster data: %s", ybmAuthClient.GetApiErrorDetails(err))
 		}
-		drId, clusterId, err := authApi.GetDrDetailsByName(drName)
+		drInfo, err := authApi.GetDrDetailsByName(drName)
 		if err != nil {
 			logrus.Fatal(err)
 		}
+		drId := drInfo.GetId()
+		clusterId := drInfo.GetSourceClusterId()
 		namespacesResp, r, err := authApi.GetClusterNamespaces(clusterId).Execute()
 		if err != nil {
 			logrus.Debugf("Full HTTP response: %v", r)

diff --git a/cmd/dr/resume_dr.go b/cmd/dr/resume_dr.go
@@ -42,10 +42,12 @@ var resumeDrCmd = &cobra.Command{
 		if err != nil {
 			logrus.Fatalf("Could not get cluster data: %s", ybmAuthClient.GetApiErrorDetails(err))
 		}
-		drId, clusterId, err := authApi.GetDrDetailsByName(drName)
+		drInfo, err := authApi.GetDrDetailsByName(drName)
 		if err != nil {
 			logrus.Fatal(err)
 		}
+		drId := drInfo.GetId()
+		clusterId := drInfo.GetSourceClusterId()
 
 		response, err := authApi.ResumeXClusterDr(clusterId, drId).Execute()
 		if err != nil {

diff --git a/cmd/dr/switchover_dr.go b/cmd/dr/switchover_dr.go
@@ -42,10 +42,12 @@ var switchoverDrCmd = &cobra.Command{
 		if err != nil {
 			logrus.Fatalf("Could not get cluster data: %s", ybmAuthClient.GetApiErrorDetails(err))
 		}
-		drId, clusterId, err := authApi.GetDrDetailsByName(drName)
+		drInfo, err := authApi.GetDrDetailsByName(drName)
 		if err != nil {
 			logrus.Fatal(err)
 		}
+		drId := drInfo.GetId()
+		clusterId := drInfo.GetSourceClusterId()
 
 		response, err := authApi.SwitchoverXClusterDr(clusterId, drId).Execute()
 		if err != nil {

diff --git a/cmd/dr/update_dr.go b/cmd/dr/update_dr.go
@@ -44,10 +44,12 @@ var updateDrCmd = &cobra.Command{
 		if err != nil {
 			logrus.Fatalf("Could not get cluster data: %s", ybmAuthClient.GetApiErrorDetails(err))
 		}
-		drId, clusterId, err := authApi.GetDrDetailsByName(drName)
+		drInfo, err := authApi.GetDrDetailsByName(drName)
 		if err != nil {
 			logrus.Fatal(err)
 		}
+		drId := drInfo.GetId()
+		clusterId := drInfo.GetSourceClusterId()
 		namespacesResp, r, err := authApi.GetClusterNamespaces(clusterId).Execute()
 		if err != nil {
 			logrus.Debugf("Full HTTP response: %v", r)

diff --git a/internal/client/client.go b/internal/client/client.go
@@ -587,13 +587,13 @@ func (a *AuthApiClient) GetClusterIdByName(clusterName string) (string, error) {
 	return "", fmt.Errorf("could not get cluster data for cluster name: %s", clusterName)
 }
 
-func (a *AuthApiClient) GetDrDetailsByName(drName string) (string, string, error) {
+func (a *AuthApiClient) GetDrDetailsByName(drName string) (ybmclient.XClusterDrInfo, error) {
 	drData, err := a.GetDrByName(drName)
 	if err == nil {
-		return drData.Info.GetId(), drData.Info.GetSourceClusterId(), nil
+		return drData.GetInfo(), nil
 	}
 
-	return "", "", fmt.Errorf("Could not get data for the DR config %s", drName)
+	return ybmclient.XClusterDrInfo{}, fmt.Errorf("Could not get data for the DR config %s", drName)
 }
 
 func (a *AuthApiClient) CreateCluster() ybmclient.ApiCreateClusterRequest {