From 63f9f696c8a476d775bc76c9a8895394754bd8f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Tue, 2 Jul 2024 11:27:37 +0800
Subject: [PATCH] foeward

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 15 +++++++++++++++
 tests/e2e/greptimedbcluster_test.go           | 19 ++++++-------------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 620662e4..698adf96 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -26,6 +26,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	"k8s.io/klog/v2"
 )
 
 var _ = Describe("Basic test of greptimedb cluster in baremetal", Ordered, func() {
@@ -41,6 +42,10 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", Ordered, func(
 		var err error
 		createcmd := newCreateClusterinBaremetalCommand()
 
+		go func() {
+			forwardRequestinbaremetal()
+		}()
+
 		err = createcmd.Start()
 		Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
 
@@ -161,3 +166,13 @@ func killProcess(pid int) error {
 	return err
 }
 */
+
+func forwardRequestinbaremetal() {
+	for {
+		cmd := exec.Command("kubectl", "port-forward", "svc/mydb-frontend", "4002:4002")
+		if err := cmd.Run(); err != nil {
+			klog.Errorf("Failed to port forward: %v", err)
+			return
+		}
+	}
+}
diff --git a/tests/e2e/greptimedbcluster_test.go b/tests/e2e/greptimedbcluster_test.go
index c373249f..fa750248 100644
--- a/tests/e2e/greptimedbcluster_test.go
+++ b/tests/e2e/greptimedbcluster_test.go
@@ -66,7 +66,6 @@ type TestData struct {
 var _ = Describe("Basic test of greptimedb cluster", Ordered, func() {
 	It("Bootstrap cluster", func() {
 		var err error
-		sig := true
 		err = createCluster()
 		Expect(err).NotTo(HaveOccurred(), "failed to create cluster")
 
@@ -77,7 +76,7 @@ var _ = Describe("Basic test of greptimedb cluster", Ordered, func() {
 		Expect(err).NotTo(HaveOccurred(), "failed to list cluster")
 
 		go func() {
-			forwardRequest(&sig)
+			forwardRequest()
 		}()
 
 		By("Connecting GreptimeDB")
@@ -87,7 +86,7 @@ var _ = Describe("Basic test of greptimedb cluster", Ordered, func() {
 		Eventually(func() error {
 			cfg := mysql.Config{
 				Net:                  "tcp",
-				Addr:                 "127.0.0.1:4002",
+				Addr:                 "127.0.0.1:4005",
 				User:                 "",
 				Passwd:               "",
 				DBName:               "",
@@ -139,8 +138,6 @@ var _ = Describe("Basic test of greptimedb cluster", Ordered, func() {
 
 		err = deleteCluster()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster")
-
-		sig = false
 	})
 })
 
@@ -184,15 +181,11 @@ func deleteCluster() error {
 	return nil
 }
 
-func forwardRequest(sig *bool) {
+func forwardRequest() {
 	for {
-		if *sig {
-			cmd := exec.Command("kubectl", "port-forward", "svc/mydb-frontend", "4002:4002")
-			if err := cmd.Run(); err != nil {
-				klog.Errorf("Failed to port forward: %v", err)
-				return
-			}
-		} else {
+		cmd := exec.Command("kubectl", "port-forward", "svc/mydb-frontend", "4002:4005")
+		if err := cmd.Run(); err != nil {
+			klog.Errorf("Failed to port forward: %v", err)
 			return
 		}
 	}