chore: modify handleRoleChange DAG update to patch (#4559)

(cherry picked from commit 5974078)
apecloud · Aug 1, 2023 · 7d22af2 · 7d22af2
1 parent a7a40e9
commit 7d22af2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/controllers/apps/components/replication_set.go b/controllers/apps/components/replication_set.go
@@ -204,14 +204,14 @@ func (r *replicationSet) HandleRoleChange(ctx context.Context, obj client.Object
 			needUpdate = handlePrimaryNotExistPod(pod)
 		default:
 			if len(primaryPods) != 1 {
-				return nil, errors.New(fmt.Sprintf("the number of primary pod is not equal to 1, primary pod: %v", primaryPods))
+				return nil, errors.New(fmt.Sprintf("the number of primary pod is not equal to 1, primary pods: %v, emptyRole pods: %v", primaryPods, emptyRolePods))
 			}
 			needUpdate = handlePrimaryExistPod(pod, primaryPods[0])
 		}
 		if needUpdate {
 			vertexes = append(vertexes, &ictrltypes.LifecycleVertex{
 				Obj:    pod,
-				Action: ictrltypes.ActionUpdatePtr(),
+				Action: ictrltypes.ActionPatchPtr(),
 			})
 		}
 	}

diff --git a/controllers/apps/components/replication_set_test.go b/controllers/apps/components/replication_set_test.go
@@ -263,7 +263,7 @@ var _ = Describe("Replication Component", func() {
 			vertexes, err = replicationComponent.HandleRoleChange(ctx, replicationSetSts)
 			Expect(err).To(Succeed())
 			Expect(len(vertexes)).To(Equal(int(replicas)))
-			Expect(*vertexes[0].(*ictrltypes.LifecycleVertex).Action == ictrltypes.UPDATE).To(BeTrue())
+			Expect(*vertexes[0].(*ictrltypes.LifecycleVertex).Action == ictrltypes.PATCH).To(BeTrue())
 
 			By("Test handleRoleChange when statefulSet h-scale out a new Pod with no role label")
 			status.Replicas = 3
@@ -276,7 +276,7 @@ var _ = Describe("Replication Component", func() {
 			vertexes, err = replicationComponent.HandleRoleChange(ctx, replicationSetSts)
 			Expect(err).To(Succeed())
 			Expect(len(vertexes)).To(Equal(3))
-			Expect(*vertexes[0].(*ictrltypes.LifecycleVertex).Action == ictrltypes.UPDATE).To(BeTrue())
+			Expect(*vertexes[0].(*ictrltypes.LifecycleVertex).Action == ictrltypes.PATCH).To(BeTrue())
 		})
 	})
 })