Skip to content

fix: switchover validate fail #586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sophon-zt merged 2 commits into from
Mar 10, 2025
Merged

fix: switchover validate fail #586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1efb0a3
fix: switchover validate fail
sophon-zt Mar 10, 2025
63de5ca
fix ut
sophon-zt Mar 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions pkg/cmd/cluster/operations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,8 +605,29 @@ func (o *OperationsOptions) validatePromote(cluster *appsv1alpha1.Cluster) error
return nil
}

if cluster.Spec.ComponentSpecs[0].ComponentDef != "" {
return validateBaseOnCompDef(cluster.Spec.ComponentSpecs[0].ComponentDef)
resolveComponent := func(cluster *appsv1alpha1.Cluster, componentName string) *appsv1alpha1.ClusterComponentSpec {
componentSpec := cluster.Spec.GetComponentByName(componentName)
if componentSpec != nil {
return componentSpec
}
for i, spec := range cluster.Spec.ShardingSpecs {
if spec.Name == componentName {
return &cluster.Spec.ShardingSpecs[i].Template
}
}
return nil
}

if componentName == "" {
componentName = cluster.Spec.ComponentSpecs[0].Name
}
componentSpec := resolveComponent(cluster, componentName)
if componentSpec == nil {
return fmt.Errorf("component %s not found", componentName)
}

if componentSpec.ComponentDef != "" {
return validateBaseOnCompDef(componentSpec.ComponentDef)
} else {
return validateBaseOnClusterCompDef()
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/cmd/cluster/operations_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ var _ = Describe("operations", func() {
o.Instance = ""
o.Component = testing.ComponentDefName
Expect(o.Validate()).ShouldNot(Succeed())
Expect(testing.ContainExpectStrings(o.Validate().Error(), "is invalid")).Should(BeTrue())
Expect(testing.ContainExpectStrings(o.Validate().Error(), "component fake-component-type not found")).Should(BeTrue())
})

It("Switchover ops base on component definition", func() {
Expand Down Expand Up @@ -405,7 +405,7 @@ var _ = Describe("operations", func() {
o.Component = testing.ComponentDefName
Expect(o.Validate()).ShouldNot(Succeed())
fmt.Println(o.Validate().Error())
Expect(testing.ContainExpectStrings(o.Validate().Error(), "is invalid")).Should(BeTrue())
Expect(testing.ContainExpectStrings(o.Validate().Error(), "component fake-component-type not found")).Should(BeTrue())
})

It("Custom ops base on component definition", func() {
Expand Down