From 27c649a50a40d4c96ed73262bbaaabbc47bc6dcc Mon Sep 17 00:00:00 2001
From: lut777 <tony.leu777@gmail.com>
Date: Fri, 16 Jul 2021 13:29:25 +0800
Subject: [PATCH] match chassis until timeout

---
 pkg/controller/node.go | 41 +++++++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/pkg/controller/node.go b/pkg/controller/node.go
index 903cd2a26cc..a9acd57d539 100644
--- a/pkg/controller/node.go
+++ b/pkg/controller/node.go
@@ -3,6 +3,7 @@ package controller
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"strings"
 	"time"
@@ -225,7 +226,7 @@ func (c *Controller) handleAddNode(key string) error {
 		return err
 	}
 
-	if err := c.checkChassisDupl(node); err != nil {
+	if err := c.retryDelDupChassis(util.ChasRetryTime, util.ChasRetryIntev+2, c.checkChassisDupl, node); err != nil {
 		return err
 	}
 
@@ -413,7 +414,7 @@ func (c *Controller) handleUpdateNode(key string) error {
 		return err
 	}
 
-	if err := c.checkChassisDupl(node); err != nil {
+	if err := c.retryDelDupChassis(util.ChasRetryTime, util.ChasRetryIntev+2, c.checkChassisDupl, node); err != nil {
 		return err
 	}
 
@@ -604,17 +605,37 @@ func (c *Controller) checkChassisDupl(node *v1.Node) error {
 		klog.Errorf("failed to get node %s chassisID, %v", node.Name, err)
 		return err
 	}
-
 	chassisAnn := node.Annotations[util.ChassisAnnotation]
-	if chassisAnn != "" && chassisAnn != chassisAdd {
-		klog.Errorf("duplicate chassis for node %s and new chassis %s", node.Name, chassisAdd)
-		if err := c.ovnClient.DeleteChassis(node.Name); err != nil {
-			klog.Errorf("failed to delete chassis for node %s %v", node.Name, err)
-			return err
-		}
+	if chassisAnn == chassisAdd || chassisAnn == "" {
+		return nil
 	}
 
-	klog.V(3).Infof("finish check chassis, add %s and ann %s", chassisAdd, chassisAnn)
+	klog.Errorf("duplicate chassis for node %s and new chassis %s", node.Name, chassisAdd)
+	if err := c.ovnClient.DeleteChassis(node.Name); err != nil {
+		klog.Errorf("failed to delete chassis for node %s %v", node.Name, err)
+		return err
+	}
+	return errors.New("deleting dismatch chassis id")
+}
+
+func (c *Controller) retryDelDupChassis(attempts int, sleep int, f func(node *v1.Node) error, node *v1.Node) (err error) {
+	i := 0
+	for ; ; i++ {
+		err = f(node)
+		if err == nil {
+			return
+		}
+		if i >= (attempts - 1) {
+			break
+		}
+		time.Sleep(time.Duration(sleep) * time.Second)
+	}
+	if i >= (attempts - 1) {
+		errMsg := fmt.Errorf("exhausting all attempts")
+		klog.Error(errMsg)
+		return errMsg
+	}
+	klog.V(3).Infof("finish check chassis")
 	return nil
 }