Skip to content
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

do not exit if chassis is not found #4246

Merged
merged 1 commit into from
Jul 2, 2024
Merged

do not exit if chassis is not found #4246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions pkg/controller/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,8 +856,10 @@ func (c *Controller) initNodeChassis() error {
}
for _, node := range nodes {
if err := c.UpdateChassisTag(node); err != nil {
klog.Error(err)
return err
if _, ok := err.(*ErrChassisNotFound); !ok {
klog.Error(err)
return err
}
}
}
return nil
Expand Down
17 changes: 13 additions & 4 deletions pkg/controller/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ import (
"github.com/kubeovn/kube-ovn/pkg/util"
)

type ErrChassisNotFound struct {
Chassis string
Node string
}

func (e *ErrChassisNotFound) Error() string {
return fmt.Sprintf("chassis %s not found for node %s", e.Chassis, e.Node)
}

func (c *Controller) enqueueAddNode(obj interface{}) {
var key string
var err error
Expand Down Expand Up @@ -892,21 +901,21 @@ func (c *Controller) UpdateChassisTag(node *v1.Node) error {
}
chassis, err := c.OVNSbClient.GetChassis(annoChassisName, true)
if err != nil {
klog.Errorf("failed to get node %s chassis: %s, %v", node.Name, annoChassisName, err)
klog.Errorf("failed to get chassis %s for node %s: %v", annoChassisName, node.Name, err)
return err
}
if chassis == nil {
klog.Infof("chassis not registered for node %s, do chassis gc once", node.Name)
klog.Infof("chassis %q not registered for node %s, do chassis gc once", annoChassisName, node.Name)
// chassis name conflict, do GC
if err = c.gcChassis(); err != nil {
klog.Errorf("failed to gc chassis: %v", err)
return err
}
return fmt.Errorf("chassis not registered for node %s, will try again later", node.Name)
return &ErrChassisNotFound{Chassis: annoChassisName, Node: node.Name}
}

if chassis.ExternalIDs == nil || chassis.ExternalIDs["vendor"] != util.CniTypeName {
klog.Infof("init tag %s for node %s chassis", util.CniTypeName, node.Name)
klog.Infof("init tag %s for node %s chassis %s", util.CniTypeName, node.Name, chassis.Name)
if err = c.OVNSbClient.UpdateChassisTag(chassis.Name, node.Name); err != nil {
return fmt.Errorf("failed to init chassis tag, %v", err)
}
Expand Down
Loading