Merge pull request #180 from River-sh/fix_panic

fix the panic when the active endpoints of gateway is nil/empty

Author: YTGhost

pkg/proxyengine/proxyserver/interceptor.go

@@ -189,9 +189,9 @@ func serveRequest(conn net.Conn, w http.ResponseWriter, r *http.Request) {
 			ctx := r.Context()
 			select {
 			case <-stopCh:
-				klog.Info("chunked request(%s) normally exit", r.URL.String())
+				klog.Infof("chunked request(%s) normally exit", r.URL.String())
 			case <-ctx.Done():
-				klog.Info("chunked request(%s) to agent(%s) closed by cloud client, %v", r.URL.String(),
+				klog.Infof("chunked request(%s) to agent(%s) closed by cloud client, %v", r.URL.String(),
 					r.Header.Get(utils.RavenProxyHostHeaderKey), ctx.Err())
 				conn.Close()
 			}

pkg/proxyengine/proxyserver/manageheader.go

@@ -145,8 +145,7 @@ func (h *headerManger) getAPIServerRequestDestAddress(r *http.Request) (name, ip
 	}
 	name, err = h.getGatewayNodeName(&node)
 	if err != nil {
-		return "", "", "", fmt.Errorf("gateway include node %s, has no active endpoints, error %s",
-			node.Name, err.Error())
+		return "", "", "", fmt.Errorf("can not find gateway node for node %s, error %s", node.Name, err.Error())
 	}
 	ip = getNodeIP(&node)
 	if ip == "" {
@@ -180,8 +179,7 @@ func (h *headerManger) getNormalRequestDestAddress(r *http.Request) (name, ip, p
 	}
 	name, err = h.getGatewayNodeName(&node)
 	if err != nil {
-		return "", "", "", fmt.Errorf("gateway include node %s, has no active endpoints, error %s",
-			node.Name, err.Error())
+		return "", "", "", fmt.Errorf("can not find gateway node for node %s, error %s", node.Name, err.Error())
 	}
 	ip = getNodeIP(&node)
 	if ip == "" {
@@ -241,6 +239,18 @@ func (h *headerManger) getGatewayNodeName(node *v1.Node) (string, error) {
 		}
 		return "", err
 	}
-	rand.Seed(time.Now().Unix())
-	return gw.Status.ActiveEndpoints[rand.Intn(len(gw.Status.ActiveEndpoints))].NodeName, nil
+	if gw.Status.ActiveEndpoints == nil {
+		return "", fmt.Errorf("no active endpoints for gw %s", gwName)
+	}
+	names := make([]string, 0)
+	for _, ep := range gw.Status.ActiveEndpoints {
+		if ep.Type == v1beta1.Proxy {
+			names = append(names, ep.NodeName)
+		}
+	}
+	if len(names) == 0 {
+		return "", fmt.Errorf("no active endpoints for gw %s", gwName)
+	}
+	rand.New(rand.NewSource(time.Now().Unix()))
+	return names[rand.Intn(len(names))], nil
 }

pkg/proxyengine/proxyserver/manageheader_test.go

@@ -0,0 +1,95 @@
+package proxyserver
+
+import (
+	"testing"
+
+	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	"github.com/openyurtio/api/raven"
+	"github.com/openyurtio/api/raven/v1beta1"
+)
+
+func NewFakeClient(objs ...runtime.Object) client.Client {
+	scheme := runtime.NewScheme()
+	_ = v1.AddToScheme(scheme)
+	_ = v1beta1.AddToScheme(scheme)
+	return fake.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(objs...).Build()
+}
+
+var node1 = &v1.Node{
+	ObjectMeta: metav1.ObjectMeta{
+		Name: "node1",
+		Labels: map[string]string{
+			raven.LabelCurrentGateway: "gw-fake",
+		},
+	},
+}
+
+var node2 = &v1.Node{
+	ObjectMeta: metav1.ObjectMeta{
+		Name: "node2",
+		Labels: map[string]string{
+			raven.LabelCurrentGateway: "gw-fake",
+		},
+	},
+}
+
+var gw = &v1beta1.Gateway{
+	ObjectMeta: metav1.ObjectMeta{
+		Name: "gw-fake",
+	},
+	Spec: v1beta1.GatewaySpec{
+		NodeSelector: &metav1.LabelSelector{
+			MatchLabels: map[string]string{
+				raven.LabelCurrentGateway: "gw-fake",
+			},
+		},
+		Endpoints: []v1beta1.Endpoint{
+			{
+				NodeName: "node1",
+			},
+			{
+				NodeName: "node2",
+			},
+		},
+	},
+	Status: v1beta1.GatewayStatus{
+		Nodes: []v1beta1.NodeInfo{
+			{
+				NodeName: "node1",
+			},
+			{
+				NodeName: "node2",
+			},
+		},
+		ActiveEndpoints: []*v1beta1.Endpoint{
+			{
+				NodeName: "node1",
+				Type:     v1beta1.Proxy,
+			},
+			{
+				NodeName: "node1",
+				Type:     v1beta1.Tunnel,
+			},
+		},
+	},
+}
+
+func Test_GetGatewayNodeName(t *testing.T) {
+	hm := &headerManger{
+		client:      NewFakeClient(node1, node2, gw),
+		gatewayName: "gw-fake",
+		isIPv4:      true,
+	}
+	result, err := hm.getGatewayNodeName(node1)
+	if err != nil {
+		t.Errorf("get gateway node name failed: %v", err)
+	}
+	if node1.Name != result {
+		t.Errorf("get gateway node name failed: %v", err)
+	}
+}