From 71081ccafb0fc7a64b5bb7fd76e7088e163ee85f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?=
 <zhuangrunzi@zhuangrunzideMacBook-Pro.local>
Date: Wed, 12 Jun 2024 17:48:52 +0800
Subject: [PATCH 001/108] ifx

---
 tests/e2e/greptimedbcluster_test.go | 74 +++++++++++++++++++++++++----
 1 file changed, 64 insertions(+), 10 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_test.go b/tests/e2e/greptimedbcluster_test.go
index 30b35f2d..5e55aeae 100644
--- a/tests/e2e/greptimedbcluster_test.go
+++ b/tests/e2e/greptimedbcluster_test.go
@@ -66,14 +66,27 @@ type TestData struct {
 var _ = Describe("Basic test of greptimedb cluster", func() {
 	It("Bootstrap cluster", func() {
 		var err error
-		err = createCluster()
-		Expect(err).NotTo(HaveOccurred(), "failed to create cluster")
-
-		err = getCluster()
-		Expect(err).NotTo(HaveOccurred(), "failed to get cluster")
-
-		err = listCluster()
-		Expect(err).NotTo(HaveOccurred(), "failed to list cluster")
+		Context("when greptimedb cluster running in k8s", func() {
+			It("test greotimedb cluster in k8s", func() {
+				err = createCluster()
+				Expect(err).NotTo(HaveOccurred(), "failed to create cluster")
+
+				err = getCluster()
+				Expect(err).NotTo(HaveOccurred(), "failed to get cluster")
+
+				err = listCluster()
+				Expect(err).NotTo(HaveOccurred(), "failed to list cluster")
+			})
+		})
+		Context("when greptimedb cluster running in baremetal", func() {
+			It("test greptimedb cluster in baremetal", func() {
+				err = createClusterinBaremetal()
+				Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
+
+				err = getClusterinBaremetal()
+				Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
+			})
+		})
 
 		go func() {
 			forwardRequest()
@@ -136,8 +149,19 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 		}
 		Expect(len(data) == testRowIDNum).Should(BeTrue(), "get the wrong data from db")
 
-		err = deleteCluster()
-		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster")
+		Context("when greptimedb cluster running in k8s", func() {
+			It("test greotimedb cluster in k8s", func() {
+				err = deleteCluster()
+				Expect(err).NotTo(HaveOccurred(), "failed to delete cluster")
+			})
+		})
+
+		Context("when greptimedb cluster running in baremetal", func() {
+			It("test greptimedb cluster in baremetal", func() {
+				err = deleteClusterinBaremetal()
+				Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")
+			})
+		})
 	})
 })
 
@@ -151,6 +175,16 @@ func createCluster() error {
 	return nil
 }
 
+func createClusterinBaremetal() error {
+	cmd := exec.Command("../../bin/gtctl", "cluster", "create", "mydb", "--timeout", "300", "--bare-metal")
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	if err := cmd.Run(); err != nil {
+		return err
+	}
+	return nil
+}
+
 func getCluster() error {
 	cmd := exec.Command("../../bin/gtctl", "cluster", "get", "mydb")
 	cmd.Stdout = os.Stdout
@@ -161,6 +195,16 @@ func getCluster() error {
 	return nil
 }
 
+func getClusterinBaremetal() error {
+	cmd := exec.Command("../../bin/gtctl", "cluster", "get", "mydb", "--bare-metal")
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	if err := cmd.Run(); err != nil {
+		return err
+	}
+	return nil
+}
+
 func listCluster() error {
 	cmd := exec.Command("../../bin/gtctl", "cluster", "list")
 	cmd.Stdout = os.Stdout
@@ -181,6 +225,16 @@ func deleteCluster() error {
 	return nil
 }
 
+func deleteClusterinBaremetal() error {
+	cmd := exec.Command("../../bin/gtctl", "cluster", "delete", "mydb", "--tear-down-etcd", "--bare-metal")
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	if err := cmd.Run(); err != nil {
+		return err
+	}
+	return nil
+}
+
 func forwardRequest() {
 	for {
 		cmd := exec.Command("kubectl", "port-forward", "svc/mydb-frontend", "4002:4002")

From 0e0f9b93618f7f63940c1f9744ec8b7ea502e779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Thu, 13 Jun 2024 17:14:35 +0800
Subject: [PATCH 002/108] fix2

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 tests/e2e/greptimedbcluster_baremetal_test.go

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
new file mode 100644
index 00000000..e69de29b

From 693a722a2aa5a2a8bf4c6d590e7eeee49dd5ae61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 14 Jun 2024 15:51:59 +0800
Subject: [PATCH 003/108] fix2

---
 tests/e2e/greptimedbcluster_baremetal_test.go |  0
 tests/e2e/greptimedbcluster_test.go           | 74 +++----------------
 2 files changed, 10 insertions(+), 64 deletions(-)
 delete mode 100644 tests/e2e/greptimedbcluster_baremetal_test.go

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/e2e/greptimedbcluster_test.go b/tests/e2e/greptimedbcluster_test.go
index 5e55aeae..30b35f2d 100644
--- a/tests/e2e/greptimedbcluster_test.go
+++ b/tests/e2e/greptimedbcluster_test.go
@@ -66,27 +66,14 @@ type TestData struct {
 var _ = Describe("Basic test of greptimedb cluster", func() {
 	It("Bootstrap cluster", func() {
 		var err error
-		Context("when greptimedb cluster running in k8s", func() {
-			It("test greotimedb cluster in k8s", func() {
-				err = createCluster()
-				Expect(err).NotTo(HaveOccurred(), "failed to create cluster")
-
-				err = getCluster()
-				Expect(err).NotTo(HaveOccurred(), "failed to get cluster")
-
-				err = listCluster()
-				Expect(err).NotTo(HaveOccurred(), "failed to list cluster")
-			})
-		})
-		Context("when greptimedb cluster running in baremetal", func() {
-			It("test greptimedb cluster in baremetal", func() {
-				err = createClusterinBaremetal()
-				Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
-
-				err = getClusterinBaremetal()
-				Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
-			})
-		})
+		err = createCluster()
+		Expect(err).NotTo(HaveOccurred(), "failed to create cluster")
+
+		err = getCluster()
+		Expect(err).NotTo(HaveOccurred(), "failed to get cluster")
+
+		err = listCluster()
+		Expect(err).NotTo(HaveOccurred(), "failed to list cluster")
 
 		go func() {
 			forwardRequest()
@@ -149,19 +136,8 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 		}
 		Expect(len(data) == testRowIDNum).Should(BeTrue(), "get the wrong data from db")
 
-		Context("when greptimedb cluster running in k8s", func() {
-			It("test greotimedb cluster in k8s", func() {
-				err = deleteCluster()
-				Expect(err).NotTo(HaveOccurred(), "failed to delete cluster")
-			})
-		})
-
-		Context("when greptimedb cluster running in baremetal", func() {
-			It("test greptimedb cluster in baremetal", func() {
-				err = deleteClusterinBaremetal()
-				Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")
-			})
-		})
+		err = deleteCluster()
+		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster")
 	})
 })
 
@@ -175,16 +151,6 @@ func createCluster() error {
 	return nil
 }
 
-func createClusterinBaremetal() error {
-	cmd := exec.Command("../../bin/gtctl", "cluster", "create", "mydb", "--timeout", "300", "--bare-metal")
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	if err := cmd.Run(); err != nil {
-		return err
-	}
-	return nil
-}
-
 func getCluster() error {
 	cmd := exec.Command("../../bin/gtctl", "cluster", "get", "mydb")
 	cmd.Stdout = os.Stdout
@@ -195,16 +161,6 @@ func getCluster() error {
 	return nil
 }
 
-func getClusterinBaremetal() error {
-	cmd := exec.Command("../../bin/gtctl", "cluster", "get", "mydb", "--bare-metal")
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	if err := cmd.Run(); err != nil {
-		return err
-	}
-	return nil
-}
-
 func listCluster() error {
 	cmd := exec.Command("../../bin/gtctl", "cluster", "list")
 	cmd.Stdout = os.Stdout
@@ -225,16 +181,6 @@ func deleteCluster() error {
 	return nil
 }
 
-func deleteClusterinBaremetal() error {
-	cmd := exec.Command("../../bin/gtctl", "cluster", "delete", "mydb", "--tear-down-etcd", "--bare-metal")
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	if err := cmd.Run(); err != nil {
-		return err
-	}
-	return nil
-}
-
 func forwardRequest() {
 	for {
 		cmd := exec.Command("kubectl", "port-forward", "svc/mydb-frontend", "4002:4002")

From 7f9be86691440ed8029c1a429982e905211bb2ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 14 Jun 2024 16:04:39 +0800
Subject: [PATCH 004/108] fix3

---
 tests/e2e/greptimedbcluster_test.go | 39 +++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/tests/e2e/greptimedbcluster_test.go b/tests/e2e/greptimedbcluster_test.go
index 30b35f2d..a0a259a5 100644
--- a/tests/e2e/greptimedbcluster_test.go
+++ b/tests/e2e/greptimedbcluster_test.go
@@ -72,6 +72,12 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 		err = getCluster()
 		Expect(err).NotTo(HaveOccurred(), "failed to get cluster")
 
+		err = createClusterinBaremetal()
+		Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
+
+		err = getClusterinBaremetal()
+		Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
+
 		err = listCluster()
 		Expect(err).NotTo(HaveOccurred(), "failed to list cluster")
 
@@ -138,6 +144,9 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 
 		err = deleteCluster()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster")
+
+		err = deleteClusterinBaremetal()
+		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")
 	})
 })
 
@@ -151,6 +160,16 @@ func createCluster() error {
 	return nil
 }
 
+func createClusterinBaremetal() error {
+	cmd := exec.Command("../../bin/gtctl", "cluster", "create", "mydb", "--timeout", "300", "--bare-metal")
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	if err := cmd.Run(); err != nil {
+		return err
+	}
+	return nil
+}
+
 func getCluster() error {
 	cmd := exec.Command("../../bin/gtctl", "cluster", "get", "mydb")
 	cmd.Stdout = os.Stdout
@@ -161,6 +180,16 @@ func getCluster() error {
 	return nil
 }
 
+func getClusterinBaremetal() error {
+	cmd := exec.Command("../../bin/gtctl", "cluster", "get", "mydb", "--bare-metal")
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	if err := cmd.Run(); err != nil {
+		return err
+	}
+	return nil
+}
+
 func listCluster() error {
 	cmd := exec.Command("../../bin/gtctl", "cluster", "list")
 	cmd.Stdout = os.Stdout
@@ -181,6 +210,16 @@ func deleteCluster() error {
 	return nil
 }
 
+func deleteClusterinBaremetal() error {
+	cmd := exec.Command("../../bin/gtctl", "cluster", "delete", "mydb", "--tear-down-etcd", "--bare-metal")
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	if err := cmd.Run(); err != nil {
+		return err
+	}
+	return nil
+}
+
 func forwardRequest() {
 	for {
 		cmd := exec.Command("kubectl", "port-forward", "svc/mydb-frontend", "4002:4002")

From eacc7bca958ea5c0c6884a0299686d18b11cc072 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 14 Jun 2024 16:39:36 +0800
Subject: [PATCH 005/108] fix3

---
 pkg/cluster/baremetal/create.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/cluster/baremetal/create.go b/pkg/cluster/baremetal/create.go
index ffa54ebb..f1f39c3f 100644
--- a/pkg/cluster/baremetal/create.go
+++ b/pkg/cluster/baremetal/create.go
@@ -52,7 +52,7 @@ func (c *Cluster) Create(ctx context.Context, options *opt.CreateOptions) error
 		return nil
 	}
 
-	if c.useMemoryMeta {
+	if !c.useMemoryMeta {
 		if err := withSpinner("Etcd Cluster", c.createEtcdCluster); err != nil {
 			return err
 		}

From d6ade886c156b4aeae9a66cd766e387760f4468c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 14 Jun 2024 17:11:53 +0800
Subject: [PATCH 006/108] fix4

---
 tests/e2e/greptimedbcluster_test.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_test.go b/tests/e2e/greptimedbcluster_test.go
index a0a259a5..252e24b9 100644
--- a/tests/e2e/greptimedbcluster_test.go
+++ b/tests/e2e/greptimedbcluster_test.go
@@ -72,16 +72,19 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 		err = getCluster()
 		Expect(err).NotTo(HaveOccurred(), "failed to get cluster")
 
+		err = listCluster()
+		Expect(err).NotTo(HaveOccurred(), "failed to list cluster")
+
 		err = createClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
 
-		err = getClusterinBaremetal()
-		Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
+		go func() {
+			err = getClusterinBaremetal()
+			Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
 
-		err = listCluster()
-		Expect(err).NotTo(HaveOccurred(), "failed to list cluster")
+			err = deleteClusterinBaremetal()
+			Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")
 
-		go func() {
 			forwardRequest()
 		}()
 
@@ -144,9 +147,6 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 
 		err = deleteCluster()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster")
-
-		err = deleteClusterinBaremetal()
-		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")
 	})
 })
 

From 3b2ed050e6a110485c6b9ccaabe3acc76b62abe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 14 Jun 2024 18:33:11 +0800
Subject: [PATCH 007/108] fix4

---
 tests/e2e/greptimedbcluster_test.go | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_test.go b/tests/e2e/greptimedbcluster_test.go
index 252e24b9..ebe9f176 100644
--- a/tests/e2e/greptimedbcluster_test.go
+++ b/tests/e2e/greptimedbcluster_test.go
@@ -74,17 +74,18 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 
 		err = listCluster()
 		Expect(err).NotTo(HaveOccurred(), "failed to list cluster")
-
-		err = createClusterinBaremetal()
-		Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
-
 		go func() {
-			err = getClusterinBaremetal()
-			Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
+			err = createClusterinBaremetal()
+			Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
+		}()
 
-			err = deleteClusterinBaremetal()
-			Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")
+		err = getClusterinBaremetal()
+		Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
 
+		err = deleteClusterinBaremetal()
+		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")
+
+		go func() {
 			forwardRequest()
 		}()
 

From c43ef9c61cf1f15d6c96f6b1ffd61611b5f13c26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 17 Jun 2024 12:11:44 +0800
Subject: [PATCH 008/108] fix5

---
 tests/e2e/greptimedbcluster_test.go | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_test.go b/tests/e2e/greptimedbcluster_test.go
index ebe9f176..b97436eb 100644
--- a/tests/e2e/greptimedbcluster_test.go
+++ b/tests/e2e/greptimedbcluster_test.go
@@ -74,10 +74,9 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 
 		err = listCluster()
 		Expect(err).NotTo(HaveOccurred(), "failed to list cluster")
-		go func() {
-			err = createClusterinBaremetal()
-			Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
-		}()
+
+		err = createClusterinBaremetal()
+		Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
 
 		err = getClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
@@ -162,7 +161,10 @@ func createCluster() error {
 }
 
 func createClusterinBaremetal() error {
-	cmd := exec.Command("../../bin/gtctl", "cluster", "create", "mydb", "--timeout", "300", "--bare-metal")
+	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+	defer cancel()
+
+	cmd := exec.CommandContext(ctx, "../../bin/gtctl", "cluster", "create", "mydb", "--bare-metal")
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	if err := cmd.Run(); err != nil {

From ab3a3296891bfb5da1f09ac5223729fc2f959aba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 17 Jun 2024 16:22:07 +0800
Subject: [PATCH 009/108] fix6

---
 tests/e2e/greptimedbcluster_test.go | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_test.go b/tests/e2e/greptimedbcluster_test.go
index b97436eb..223375e7 100644
--- a/tests/e2e/greptimedbcluster_test.go
+++ b/tests/e2e/greptimedbcluster_test.go
@@ -75,8 +75,10 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 		err = listCluster()
 		Expect(err).NotTo(HaveOccurred(), "failed to list cluster")
 
-		err = createClusterinBaremetal()
-		Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
+		go func() {
+			err = createClusterinBaremetal()
+			Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
+		}()
 
 		err = getClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
@@ -161,10 +163,7 @@ func createCluster() error {
 }
 
 func createClusterinBaremetal() error {
-	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
-	defer cancel()
-
-	cmd := exec.CommandContext(ctx, "../../bin/gtctl", "cluster", "create", "mydb", "--bare-metal")
+	cmd := exec.Command("../../bin/gtctl", "cluster", "create", "mydb", "--bare-metal")
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	if err := cmd.Run(); err != nil {

From bb5e7a0d11d757231bf569cb7e717c8f7f0e5a93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 17 Jun 2024 16:39:44 +0800
Subject: [PATCH 010/108] fix7

---
 tests/e2e/greptimedbcluster_test.go | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_test.go b/tests/e2e/greptimedbcluster_test.go
index 223375e7..26469141 100644
--- a/tests/e2e/greptimedbcluster_test.go
+++ b/tests/e2e/greptimedbcluster_test.go
@@ -80,11 +80,14 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 			Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
 		}()
 
-		err = getClusterinBaremetal()
-		Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
+		go func() {
+
+			err = getClusterinBaremetal()
+			Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
 
-		err = deleteClusterinBaremetal()
-		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")
+			err = deleteClusterinBaremetal()
+			Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")
+		}()
 
 		go func() {
 			forwardRequest()

From 41a46d4fcd720f8cadb0d81191c43c7cc99e34d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 17 Jun 2024 17:04:53 +0800
Subject: [PATCH 011/108] fix8

---
 tests/e2e/greptimedbcluster_test.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/e2e/greptimedbcluster_test.go b/tests/e2e/greptimedbcluster_test.go
index 26469141..518f5870 100644
--- a/tests/e2e/greptimedbcluster_test.go
+++ b/tests/e2e/greptimedbcluster_test.go
@@ -81,6 +81,7 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 		}()
 
 		go func() {
+			time.Sleep(100 * time.Second)
 
 			err = getClusterinBaremetal()
 			Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")

From 79e2c105565f4596679ca98c32cb61ef8044b051 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, 18 Jun 2024 15:10:29 +0800
Subject: [PATCH 012/108] fix9

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 tests/e2e/greptimedbcluster_baremetal_test.go

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
new file mode 100644
index 00000000..e69de29b

From f45e9d6da2f7edef789551c8c1d725a49e216a84 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, 18 Jun 2024 15:12:25 +0800
Subject: [PATCH 013/108] fix9

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 166 ++++++++++++++++++
 tests/e2e/greptimedbcluster_test.go           |  45 -----
 2 files changed, 166 insertions(+), 45 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index e69de29b..193dc448 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -0,0 +1,166 @@
+/*
+ * Copyright 2023 Greptime Team
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package e2e
+
+import (
+	"context"
+	"database/sql"
+	"fmt"
+	"os"
+	"os/exec"
+	"time"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+
+	"github.com/go-sql-driver/mysql"
+)
+
+var _ = Describe("Basic test of greptimedb cluster", func() {
+	It("Bootstrap cluster", func() {
+		var err error
+
+		go func() {
+			err = createClusterinBaremetal()
+			Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
+		}()
+
+		go func() {
+			checkInterval := 5 * time.Second
+			timeout := 100 * time.Second
+			startTime := time.Now()
+
+			for {
+				if time.Since(startTime) > timeout {
+					Expect(fmt.Errorf("failed to get cluster in baremetal")).NotTo(HaveOccurred())
+					break
+				}
+
+				err := getClusterinBaremetal()
+				if err == nil {
+					break
+				}
+				time.Sleep(checkInterval)
+			}
+		}()
+
+		By("Connecting GreptimeDB")
+		var db *sql.DB
+		var conn *sql.Conn
+
+		Eventually(func() error {
+			cfg := mysql.Config{
+				Net:                  "tcp",
+				Addr:                 "127.0.0.1:4002",
+				User:                 "",
+				Passwd:               "",
+				DBName:               "",
+				AllowNativePasswords: true,
+			}
+
+			db, err = sql.Open("mysql", cfg.FormatDSN())
+			if err != nil {
+				return err
+			}
+
+			conn, err = db.Conn(context.TODO())
+			if err != nil {
+				return err
+			}
+
+			return nil
+		}, 30*time.Second, time.Second).ShouldNot(HaveOccurred())
+
+		By("Execute SQL queries after connecting")
+
+		ctx, cancel := context.WithTimeout(context.Background(), defaultQueryTimeout)
+		defer cancel()
+
+		_, err = conn.ExecContext(ctx, createTableSQL)
+		Expect(err).NotTo(HaveOccurred(), "failed to create SQL table")
+
+		ctx, cancel = context.WithTimeout(context.Background(), defaultQueryTimeout)
+		defer cancel()
+		for rowID := 1; rowID <= testRowIDNum; rowID++ {
+			insertDataSQL := fmt.Sprintf(insertDataSQLStr, rowID, rowID)
+			_, err = conn.ExecContext(ctx, insertDataSQL)
+			Expect(err).NotTo(HaveOccurred(), "failed to insert data")
+		}
+
+		ctx, cancel = context.WithTimeout(context.Background(), defaultQueryTimeout)
+		defer cancel()
+		results, err := conn.QueryContext(ctx, selectDataSQL)
+		Expect(err).NotTo(HaveOccurred(), "failed to get data")
+
+		var data []TestData
+		for results.Next() {
+			var d TestData
+			err = results.Scan(&d.timestamp, &d.n, &d.rowID)
+			Expect(err).NotTo(HaveOccurred(), "failed to scan data that query from db")
+			data = append(data, d)
+		}
+		Expect(len(data) == testRowIDNum).Should(BeTrue(), "get the wrong data from db")
+		go func() {
+			checkInterval := 5 * time.Second
+			timeout := 100 * time.Second
+			startTime := time.Now()
+
+			for {
+				if time.Since(startTime) > timeout {
+					Expect(fmt.Errorf("failed to delete cluster in baremetal")).NotTo(HaveOccurred())
+					break
+				}
+
+				err := deleteClusterinBaremetal()
+				if err == nil {
+					break
+				}
+				time.Sleep(checkInterval)
+			}
+		}()
+	})
+})
+
+func createClusterinBaremetal() error {
+	cmd := exec.Command("../../bin/gtctl", "cluster", "create", "mydb", "--bare-metal")
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	if err := cmd.Run(); err != nil {
+		return err
+	}
+	return nil
+}
+
+func getClusterinBaremetal() error {
+	cmd := exec.Command("../../bin/gtctl", "cluster", "get", "mydb", "--bare-metal")
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	if err := cmd.Run(); err != nil {
+		return err
+	}
+	return nil
+}
+
+func deleteClusterinBaremetal() error {
+	cmd := exec.Command("../../bin/gtctl", "cluster", "delete", "mydb", "--tear-down-etcd", "--bare-metal")
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	if err := cmd.Run(); err != nil {
+		return err
+	}
+	return nil
+}
diff --git a/tests/e2e/greptimedbcluster_test.go b/tests/e2e/greptimedbcluster_test.go
index 518f5870..30b35f2d 100644
--- a/tests/e2e/greptimedbcluster_test.go
+++ b/tests/e2e/greptimedbcluster_test.go
@@ -75,21 +75,6 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 		err = listCluster()
 		Expect(err).NotTo(HaveOccurred(), "failed to list cluster")
 
-		go func() {
-			err = createClusterinBaremetal()
-			Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
-		}()
-
-		go func() {
-			time.Sleep(100 * time.Second)
-
-			err = getClusterinBaremetal()
-			Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
-
-			err = deleteClusterinBaremetal()
-			Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")
-		}()
-
 		go func() {
 			forwardRequest()
 		}()
@@ -166,16 +151,6 @@ func createCluster() error {
 	return nil
 }
 
-func createClusterinBaremetal() error {
-	cmd := exec.Command("../../bin/gtctl", "cluster", "create", "mydb", "--bare-metal")
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	if err := cmd.Run(); err != nil {
-		return err
-	}
-	return nil
-}
-
 func getCluster() error {
 	cmd := exec.Command("../../bin/gtctl", "cluster", "get", "mydb")
 	cmd.Stdout = os.Stdout
@@ -186,16 +161,6 @@ func getCluster() error {
 	return nil
 }
 
-func getClusterinBaremetal() error {
-	cmd := exec.Command("../../bin/gtctl", "cluster", "get", "mydb", "--bare-metal")
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	if err := cmd.Run(); err != nil {
-		return err
-	}
-	return nil
-}
-
 func listCluster() error {
 	cmd := exec.Command("../../bin/gtctl", "cluster", "list")
 	cmd.Stdout = os.Stdout
@@ -216,16 +181,6 @@ func deleteCluster() error {
 	return nil
 }
 
-func deleteClusterinBaremetal() error {
-	cmd := exec.Command("../../bin/gtctl", "cluster", "delete", "mydb", "--tear-down-etcd", "--bare-metal")
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	if err := cmd.Run(); err != nil {
-		return err
-	}
-	return nil
-}
-
 func forwardRequest() {
 	for {
 		cmd := exec.Command("kubectl", "port-forward", "svc/mydb-frontend", "4002:4002")

From 6c240c453cb1769885209bf6360512fb5746a7ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 21 Jun 2024 15:09:58 +0800
Subject: [PATCH 014/108] fix10

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 193dc448..848d6b57 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -33,9 +33,11 @@ import (
 var _ = Describe("Basic test of greptimedb cluster", func() {
 	It("Bootstrap cluster", func() {
 		var err error
+		var createcmd exec.Cmd
 
 		go func() {
-			err = createClusterinBaremetal()
+			createcmd = newCreateClusterinBaremetalCommand()
+			err = runCreateClusterinBaremetalCommand(&createcmd)
 			Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
 		}()
 
@@ -124,7 +126,7 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 					Expect(fmt.Errorf("failed to delete cluster in baremetal")).NotTo(HaveOccurred())
 					break
 				}
-
+				createcmd.Cancel()
 				err := deleteClusterinBaremetal()
 				if err == nil {
 					break
@@ -135,16 +137,20 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 	})
 })
 
-func createClusterinBaremetal() error {
-	cmd := exec.Command("../../bin/gtctl", "cluster", "create", "mydb", "--bare-metal")
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
+func runCreateClusterinBaremetalCommand(cmd *exec.Cmd) error {
 	if err := cmd.Run(); err != nil {
 		return err
 	}
 	return nil
 }
 
+func newCreateClusterinBaremetalCommand() exec.Cmd {
+	cmd := exec.Command("../../bin/gtctl", "cluster", "create", "mydb", "--bare-metal")
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	return *cmd
+}
+
 func getClusterinBaremetal() error {
 	cmd := exec.Command("../../bin/gtctl", "cluster", "get", "mydb", "--bare-metal")
 	cmd.Stdout = os.Stdout

From 6ad8083f23eca92f594b21646e328354d28d4760 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 21 Jun 2024 15:23:28 +0800
Subject: [PATCH 015/108] fix10

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 848d6b57..d9cd7c92 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -33,11 +33,9 @@ import (
 var _ = Describe("Basic test of greptimedb cluster", func() {
 	It("Bootstrap cluster", func() {
 		var err error
-		var createcmd exec.Cmd
 
 		go func() {
-			createcmd = newCreateClusterinBaremetalCommand()
-			err = runCreateClusterinBaremetalCommand(&createcmd)
+			err = createClusterinBaremetal()
 			Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
 		}()
 
@@ -126,7 +124,7 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 					Expect(fmt.Errorf("failed to delete cluster in baremetal")).NotTo(HaveOccurred())
 					break
 				}
-				createcmd.Cancel()
+
 				err := deleteClusterinBaremetal()
 				if err == nil {
 					break
@@ -137,20 +135,19 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 	})
 })
 
-func runCreateClusterinBaremetalCommand(cmd *exec.Cmd) error {
+func createClusterinBaremetal() error {
+	ctx, cancel := context.WithTimeout(context.Background(), 50*time.Second)
+	defer cancel()
+
+	cmd := exec.CommandContext(ctx, "../../bin/gtctl", "cluster", "create", "mydb", "--bare-metal")
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
 	if err := cmd.Run(); err != nil {
 		return err
 	}
 	return nil
 }
 
-func newCreateClusterinBaremetalCommand() exec.Cmd {
-	cmd := exec.Command("../../bin/gtctl", "cluster", "create", "mydb", "--bare-metal")
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	return *cmd
-}
-
 func getClusterinBaremetal() error {
 	cmd := exec.Command("../../bin/gtctl", "cluster", "get", "mydb", "--bare-metal")
 	cmd.Stdout = os.Stdout

From 0c2990c26804ddde307faf2e25d36562b001747c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 21 Jun 2024 15:34:19 +0800
Subject: [PATCH 016/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 60 -------------------
 1 file changed, 60 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index d9cd7c92..24ef3e36 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -18,7 +18,6 @@ package e2e
 
 import (
 	"context"
-	"database/sql"
 	"fmt"
 	"os"
 	"os/exec"
@@ -26,8 +25,6 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-
-	"github.com/go-sql-driver/mysql"
 )
 
 var _ = Describe("Basic test of greptimedb cluster", func() {
@@ -57,63 +54,6 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 				time.Sleep(checkInterval)
 			}
 		}()
-
-		By("Connecting GreptimeDB")
-		var db *sql.DB
-		var conn *sql.Conn
-
-		Eventually(func() error {
-			cfg := mysql.Config{
-				Net:                  "tcp",
-				Addr:                 "127.0.0.1:4002",
-				User:                 "",
-				Passwd:               "",
-				DBName:               "",
-				AllowNativePasswords: true,
-			}
-
-			db, err = sql.Open("mysql", cfg.FormatDSN())
-			if err != nil {
-				return err
-			}
-
-			conn, err = db.Conn(context.TODO())
-			if err != nil {
-				return err
-			}
-
-			return nil
-		}, 30*time.Second, time.Second).ShouldNot(HaveOccurred())
-
-		By("Execute SQL queries after connecting")
-
-		ctx, cancel := context.WithTimeout(context.Background(), defaultQueryTimeout)
-		defer cancel()
-
-		_, err = conn.ExecContext(ctx, createTableSQL)
-		Expect(err).NotTo(HaveOccurred(), "failed to create SQL table")
-
-		ctx, cancel = context.WithTimeout(context.Background(), defaultQueryTimeout)
-		defer cancel()
-		for rowID := 1; rowID <= testRowIDNum; rowID++ {
-			insertDataSQL := fmt.Sprintf(insertDataSQLStr, rowID, rowID)
-			_, err = conn.ExecContext(ctx, insertDataSQL)
-			Expect(err).NotTo(HaveOccurred(), "failed to insert data")
-		}
-
-		ctx, cancel = context.WithTimeout(context.Background(), defaultQueryTimeout)
-		defer cancel()
-		results, err := conn.QueryContext(ctx, selectDataSQL)
-		Expect(err).NotTo(HaveOccurred(), "failed to get data")
-
-		var data []TestData
-		for results.Next() {
-			var d TestData
-			err = results.Scan(&d.timestamp, &d.n, &d.rowID)
-			Expect(err).NotTo(HaveOccurred(), "failed to scan data that query from db")
-			data = append(data, d)
-		}
-		Expect(len(data) == testRowIDNum).Should(BeTrue(), "get the wrong data from db")
 		go func() {
 			checkInterval := 5 * time.Second
 			timeout := 100 * time.Second

From a0beacb5190d0cd48515c75afea66b1bb40fcd4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 21 Jun 2024 15:42:55 +0800
Subject: [PATCH 017/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 24ef3e36..836c7dfe 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -55,22 +55,9 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 			}
 		}()
 		go func() {
-			checkInterval := 5 * time.Second
-			timeout := 100 * time.Second
-			startTime := time.Now()
-
-			for {
-				if time.Since(startTime) > timeout {
-					Expect(fmt.Errorf("failed to delete cluster in baremetal")).NotTo(HaveOccurred())
-					break
-				}
-
-				err := deleteClusterinBaremetal()
-				if err == nil {
-					break
-				}
-				time.Sleep(checkInterval)
-			}
+			time.Sleep(50 * time.Second)
+			err := deleteClusterinBaremetal()
+			Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")
 		}()
 	})
 })

From dcf2ec6c9e916506bfac5bd004283a853a436bba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 21 Jun 2024 15:54:32 +0800
Subject: [PATCH 018/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 836c7dfe..269d6bee 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -38,7 +38,7 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 
 		go func() {
 			checkInterval := 5 * time.Second
-			timeout := 100 * time.Second
+			timeout := 50 * time.Second
 			startTime := time.Now()
 
 			for {
@@ -70,7 +70,9 @@ func createClusterinBaremetal() error {
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	if err := cmd.Run(); err != nil {
-		return err
+		if ctx.Err() != context.DeadlineExceeded {
+			return err
+		}
 	}
 	return nil
 }

From a5d4d42292cbca80a138b9e5cd2cad35a53a7d1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 21 Jun 2024 16:20:04 +0800
Subject: [PATCH 019/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 269d6bee..e87e814e 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -38,7 +38,7 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 
 		go func() {
 			checkInterval := 5 * time.Second
-			timeout := 50 * time.Second
+			timeout := 100 * time.Second
 			startTime := time.Now()
 
 			for {
@@ -54,8 +54,9 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 				time.Sleep(checkInterval)
 			}
 		}()
+
 		go func() {
-			time.Sleep(50 * time.Second)
+			time.Sleep(100 * time.Second)
 			err := deleteClusterinBaremetal()
 			Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")
 		}()
@@ -63,7 +64,7 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 })
 
 func createClusterinBaremetal() error {
-	ctx, cancel := context.WithTimeout(context.Background(), 50*time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), 100*time.Second)
 	defer cancel()
 
 	cmd := exec.CommandContext(ctx, "../../bin/gtctl", "cluster", "create", "mydb", "--bare-metal")

From b0232ae71b58ec041c07d7b5cabd2ec6cb36318b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 21 Jun 2024 16:53:04 +0800
Subject: [PATCH 020/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 53 ++++++++-----------
 1 file changed, 21 insertions(+), 32 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index e87e814e..a8bcd763 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -17,8 +17,7 @@
 package e2e
 
 import (
-	"context"
-	"fmt"
+	"net"
 	"os"
 	"os/exec"
 	"time"
@@ -30,50 +29,40 @@ import (
 var _ = Describe("Basic test of greptimedb cluster", func() {
 	It("Bootstrap cluster", func() {
 		var err error
+		var cmd exec.Cmd
 
 		go func() {
-			err = createClusterinBaremetal()
+			cmd = newCreateClusterinBaremetalCommand()
+			err = createClusterinBaremetal(cmd)
 			Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
 		}()
 
-		go func() {
-			checkInterval := 5 * time.Second
-			timeout := 100 * time.Second
-			startTime := time.Now()
+		for {
+			if conn, err := net.DialTimeout("Http", "localhost:4000", 2*time.Second); err == nil {
+				defer conn.Close()
+				break
+			}
+		}
 
-			for {
-				if time.Since(startTime) > timeout {
-					Expect(fmt.Errorf("failed to get cluster in baremetal")).NotTo(HaveOccurred())
-					break
-				}
+		err = getClusterinBaremetal()
+		Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
 
-				err := getClusterinBaremetal()
-				if err == nil {
-					break
-				}
-				time.Sleep(checkInterval)
-			}
-		}()
+		cmd.Cancel()
 
-		go func() {
-			time.Sleep(100 * time.Second)
-			err := deleteClusterinBaremetal()
-			Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")
-		}()
+		err = deleteClusterinBaremetal()
+		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")
 	})
 })
 
-func createClusterinBaremetal() error {
-	ctx, cancel := context.WithTimeout(context.Background(), 100*time.Second)
-	defer cancel()
-
-	cmd := exec.CommandContext(ctx, "../../bin/gtctl", "cluster", "create", "mydb", "--bare-metal")
+func newCreateClusterinBaremetalCommand() exec.Cmd {
+	cmd := exec.Command("../../bin/gtctl", "cluster", "create", "mydb", "--bare-metal")
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
+	return *cmd
+}
+func createClusterinBaremetal(cmd exec.Cmd) error {
 	if err := cmd.Run(); err != nil {
-		if ctx.Err() != context.DeadlineExceeded {
-			return err
-		}
+		return err
 	}
 	return nil
 }

From 30f595e6900059e855af63437fcf5e39e725cf9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 21 Jun 2024 16:57:21 +0800
Subject: [PATCH 021/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index a8bcd763..9a769af6 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -47,7 +47,8 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 		err = getClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
 
-		cmd.Cancel()
+		err = cmd.Cancel()
+		Expect(err).NotTo(HaveOccurred(), "failed to exit create cluster process")
 
 		err = deleteClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")

From c94f907d748e1ec2cebb72a81edea6777e202ffb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 21 Jun 2024 17:07:08 +0800
Subject: [PATCH 022/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 9a769af6..17b0c963 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -38,7 +38,7 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 		}()
 
 		for {
-			if conn, err := net.DialTimeout("Http", "localhost:4000", 2*time.Second); err == nil {
+			if conn, err := net.DialTimeout("http", "localhost:4000", 2*time.Second); err == nil {
 				defer conn.Close()
 				break
 			}
@@ -61,6 +61,7 @@ func newCreateClusterinBaremetalCommand() exec.Cmd {
 	cmd.Stderr = os.Stderr
 	return *cmd
 }
+
 func createClusterinBaremetal(cmd exec.Cmd) error {
 	if err := cmd.Run(); err != nil {
 		return err

From 1b02bbeb81a7021ff7f649ae2b4530d7c7055e80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 21 Jun 2024 17:16:04 +0800
Subject: [PATCH 023/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 17b0c963..f38cc5f7 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -38,7 +38,7 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 		}()
 
 		for {
-			if conn, err := net.DialTimeout("http", "localhost:4000", 2*time.Second); err == nil {
+			if conn, err := net.DialTimeout("tcp", "localhost:4000", 2*time.Second); err == nil {
 				defer conn.Close()
 				break
 			}
@@ -47,8 +47,8 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 		err = getClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
 
-		err = cmd.Cancel()
-		Expect(err).NotTo(HaveOccurred(), "failed to exit create cluster process")
+		err = cmd.Process.Kill()
+		Expect(err).NotTo(HaveOccurred(), "failed to kill create cluster process")
 
 		err = deleteClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")

From 219fb5bce7d9ba49755a3f8d652a402b40f53ad2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 21 Jun 2024 17:29:55 +0800
Subject: [PATCH 024/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index f38cc5f7..48afae07 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -47,8 +47,13 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 		err = getClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
 
-		err = cmd.Process.Kill()
-		Expect(err).NotTo(HaveOccurred(), "failed to kill create cluster process")
+		for {
+			if cmd.Process != nil {
+				err = cmd.Process.Kill()
+				Expect(err).NotTo(HaveOccurred(), "failed to exit create cluster process")
+				break
+			}
+		}
 
 		err = deleteClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")

From 62062496b5e76a36c95f7d761037e8e614cd52c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 24 Jun 2024 10:48:32 +0800
Subject: [PATCH 025/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 48afae07..a277d4f9 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -26,8 +26,8 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-var _ = Describe("Basic test of greptimedb cluster", func() {
-	It("Bootstrap cluster", func() {
+var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
+	It("Bootstrap cluster in baremteal", func() {
 		var err error
 		var cmd exec.Cmd
 
@@ -47,13 +47,8 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 		err = getClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
 
-		for {
-			if cmd.Process != nil {
-				err = cmd.Process.Kill()
-				Expect(err).NotTo(HaveOccurred(), "failed to exit create cluster process")
-				break
-			}
-		}
+		err = cmd.Cancel()
+		Expect(err).NotTo(HaveOccurred(), "failed to kill create cluster process")
 
 		err = deleteClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")

From e4fb8a6f38c5b9fc6046fca98e46c003aab0d131 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 24 Jun 2024 11:01:40 +0800
Subject: [PATCH 026/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index a277d4f9..c6924363 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -29,7 +29,7 @@ import (
 var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 	It("Bootstrap cluster in baremteal", func() {
 		var err error
-		var cmd exec.Cmd
+		var cmd *exec.Cmd
 
 		go func() {
 			cmd = newCreateClusterinBaremetalCommand()
@@ -55,14 +55,14 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 	})
 })
 
-func newCreateClusterinBaremetalCommand() exec.Cmd {
+func newCreateClusterinBaremetalCommand() *exec.Cmd {
 	cmd := exec.Command("../../bin/gtctl", "cluster", "create", "mydb", "--bare-metal")
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
-	return *cmd
+	return cmd
 }
 
-func createClusterinBaremetal(cmd exec.Cmd) error {
+func createClusterinBaremetal(cmd *exec.Cmd) error {
 	if err := cmd.Run(); err != nil {
 		return err
 	}

From 72081206675bbe726b40541068344596a0a700b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 24 Jun 2024 11:19:23 +0800
Subject: [PATCH 027/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index c6924363..40ff2e72 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -29,10 +29,9 @@ import (
 var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 	It("Bootstrap cluster in baremteal", func() {
 		var err error
-		var cmd *exec.Cmd
+		cmd := newCreateClusterinBaremetalCommand()
 
 		go func() {
-			cmd = newCreateClusterinBaremetalCommand()
 			err = createClusterinBaremetal(cmd)
 			Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
 		}()

From 8f857a58d138fe0a2c0096a58294b120bf729837 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 24 Jun 2024 11:35:14 +0800
Subject: [PATCH 028/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 40ff2e72..768ee4d2 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -54,14 +54,14 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 	})
 })
 
-func newCreateClusterinBaremetalCommand() *exec.Cmd {
+func newCreateClusterinBaremetalCommand() exec.Cmd {
 	cmd := exec.Command("../../bin/gtctl", "cluster", "create", "mydb", "--bare-metal")
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
-	return cmd
+	return *cmd
 }
 
-func createClusterinBaremetal(cmd *exec.Cmd) error {
+func createClusterinBaremetal(cmd exec.Cmd) error {
 	if err := cmd.Run(); err != nil {
 		return err
 	}

From fdf91cf91db418586624a7ca851899b75e03ff4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 24 Jun 2024 14:17:45 +0800
Subject: [PATCH 029/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 768ee4d2..3fdcf72e 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -46,8 +46,12 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 		err = getClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
 
-		err = cmd.Cancel()
-		Expect(err).NotTo(HaveOccurred(), "failed to kill create cluster process")
+		if cmd.Process != nil {
+			err = cmd.Process.Kill()
+			Expect(err).NotTo(HaveOccurred(), "failed to kill create cluster process")
+		} else {
+			Fail("command process is not properly initialized")
+		}
 
 		err = deleteClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")

From 7e9282db3348a5790960c0d8f3ac21795118f830 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 24 Jun 2024 14:31:09 +0800
Subject: [PATCH 030/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 3fdcf72e..d363ed88 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -46,7 +46,7 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 		err = getClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
 
-		if cmd.Process != nil {
+		if cmd != nil && cmd.Process != nil {
 			err = cmd.Process.Kill()
 			Expect(err).NotTo(HaveOccurred(), "failed to kill create cluster process")
 		} else {
@@ -58,14 +58,14 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 	})
 })
 
-func newCreateClusterinBaremetalCommand() exec.Cmd {
+func newCreateClusterinBaremetalCommand() *exec.Cmd {
 	cmd := exec.Command("../../bin/gtctl", "cluster", "create", "mydb", "--bare-metal")
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
-	return *cmd
+	return cmd
 }
 
-func createClusterinBaremetal(cmd exec.Cmd) error {
+func createClusterinBaremetal(cmd *exec.Cmd) error {
 	if err := cmd.Run(); err != nil {
 		return err
 	}

From 367747c1249d6e31cc25b0f1f8002df5bfb50692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 24 Jun 2024 14:42:24 +0800
Subject: [PATCH 031/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index d363ed88..82444026 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -49,8 +49,10 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 		if cmd != nil && cmd.Process != nil {
 			err = cmd.Process.Kill()
 			Expect(err).NotTo(HaveOccurred(), "failed to kill create cluster process")
+		} else if cmd == nil {
+			Fail("command is not properly initialized")
 		} else {
-			Fail("command process is not properly initialized")
+			Fail("process is not properly initialized")
 		}
 
 		err = deleteClusterinBaremetal()

From d1319ab44981c2e86e92cc585b98b52c6ac75e3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 24 Jun 2024 14:54:30 +0800
Subject: [PATCH 032/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 82444026..55968074 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -46,11 +46,9 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 		err = getClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
 
-		if cmd != nil && cmd.Process != nil {
+		if cmd.Process != nil {
 			err = cmd.Process.Kill()
 			Expect(err).NotTo(HaveOccurred(), "failed to kill create cluster process")
-		} else if cmd == nil {
-			Fail("command is not properly initialized")
 		} else {
 			Fail("process is not properly initialized")
 		}
@@ -60,14 +58,14 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 	})
 })
 
-func newCreateClusterinBaremetalCommand() *exec.Cmd {
+func newCreateClusterinBaremetalCommand() exec.Cmd {
 	cmd := exec.Command("../../bin/gtctl", "cluster", "create", "mydb", "--bare-metal")
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
-	return cmd
+	return *cmd
 }
 
-func createClusterinBaremetal(cmd *exec.Cmd) error {
+func createClusterinBaremetal(cmd exec.Cmd) error {
 	if err := cmd.Run(); err != nil {
 		return err
 	}

From dc9dca71096e52a69d4dbb14ae9983770c315c68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 24 Jun 2024 15:03:37 +0800
Subject: [PATCH 033/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 55968074..dadfa359 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -66,7 +66,7 @@ func newCreateClusterinBaremetalCommand() exec.Cmd {
 }
 
 func createClusterinBaremetal(cmd exec.Cmd) error {
-	if err := cmd.Run(); err != nil {
+	if err := cmd.Start(); err != nil {
 		return err
 	}
 	return nil

From 83f8b0c4fb16bc16fceef6c04715b87c64ec823b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 24 Jun 2024 15:12:08 +0800
Subject: [PATCH 034/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index dadfa359..1bb6876e 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -46,12 +46,8 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 		err = getClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
 
-		if cmd.Process != nil {
-			err = cmd.Process.Kill()
-			Expect(err).NotTo(HaveOccurred(), "failed to kill create cluster process")
-		} else {
-			Fail("process is not properly initialized")
-		}
+		err = cmd.Process.Kill()
+		Expect(err).NotTo(HaveOccurred(), "failed to kill create cluster process")
 
 		err = deleteClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")

From be56c09c36f803a8101b647816e440a0aeb761e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 24 Jun 2024 15:22:23 +0800
Subject: [PATCH 035/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 1bb6876e..bf501e61 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -31,10 +31,8 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 		var err error
 		cmd := newCreateClusterinBaremetalCommand()
 
-		go func() {
-			err = createClusterinBaremetal(cmd)
-			Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
-		}()
+		err = cmd.Start()
+		Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
 
 		for {
 			if conn, err := net.DialTimeout("tcp", "localhost:4000", 2*time.Second); err == nil {

From 5d4163d73e16080ba17c8c24620ba749ec7484fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 24 Jun 2024 15:32:08 +0800
Subject: [PATCH 036/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index bf501e61..a92e0c3b 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -44,7 +44,7 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 		err = getClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
 
-		err = cmd.Process.Kill()
+		err = cmd.Cancel()
 		Expect(err).NotTo(HaveOccurred(), "failed to kill create cluster process")
 
 		err = deleteClusterinBaremetal()

From 1983aa69fd0d393ac603e37c563553118f9edcf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 24 Jun 2024 15:45:09 +0800
Subject: [PATCH 037/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index a92e0c3b..9791887d 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -34,18 +34,28 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 		err = cmd.Start()
 		Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
 
-		for {
-			if conn, err := net.DialTimeout("tcp", "localhost:4000", 2*time.Second); err == nil {
-				defer conn.Close()
-				break
+		go func() {
+			// 轮询检测端口是否连接成功
+			for {
+				if conn, err := net.DialTimeout("tcp", "localhost:4000", 2*time.Second); err == nil {
+					defer conn.Close()
+					break
+				}
 			}
-		}
 
-		err = getClusterinBaremetal()
-		Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
+			err = getClusterinBaremetal()
+			Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
 
-		err = cmd.Cancel()
-		Expect(err).NotTo(HaveOccurred(), "failed to kill create cluster process")
+			if cmd.Process != nil {
+				err = cmd.Process.Kill()
+				Expect(err).NotTo(HaveOccurred(), "failed to kill create cluster process")
+			} else {
+				Fail("process is not properly initialized")
+			}
+		}()
+
+		err = cmd.Wait()
+		Expect(err).NotTo(HaveOccurred(), "failed to wait for create cluster process")
 
 		err = deleteClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")

From 4e897b63be19da07af07dde01a4e0d45ba36d91e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 24 Jun 2024 15:54:45 +0800
Subject: [PATCH 038/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 9791887d..f9e621db 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -54,9 +54,6 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 			}
 		}()
 
-		err = cmd.Wait()
-		Expect(err).NotTo(HaveOccurred(), "failed to wait for create cluster process")
-
 		err = deleteClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")
 	})

From 87ea15b5928709f80d42c4e00b7c5ecfe980e7e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 24 Jun 2024 16:14:41 +0800
Subject: [PATCH 039/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index f9e621db..9bc26af3 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -34,25 +34,22 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 		err = cmd.Start()
 		Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
 
-		go func() {
-			// 轮询检测端口是否连接成功
-			for {
-				if conn, err := net.DialTimeout("tcp", "localhost:4000", 2*time.Second); err == nil {
-					defer conn.Close()
-					break
-				}
+		for {
+			if conn, err := net.DialTimeout("tcp", "localhost:4000", 2*time.Second); err == nil {
+				defer conn.Close()
+				break
 			}
+		}
 
-			err = getClusterinBaremetal()
-			Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
+		err = getClusterinBaremetal()
+		Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
 
-			if cmd.Process != nil {
-				err = cmd.Process.Kill()
-				Expect(err).NotTo(HaveOccurred(), "failed to kill create cluster process")
-			} else {
-				Fail("process is not properly initialized")
-			}
-		}()
+		if cmd.Process != nil {
+			err = cmd.Process.Kill()
+			Expect(err).NotTo(HaveOccurred(), "failed to kill create cluster process")
+		} else {
+			Fail("process is not properly initialized")
+		}
 
 		err = deleteClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")

From 0615d55e29b11e2443e24bd88ca8302a407a49c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 24 Jun 2024 16:31:19 +0800
Subject: [PATCH 040/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 9bc26af3..18a4a4a2 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -51,6 +51,15 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 			Fail("process is not properly initialized")
 		}
 
+		time.Sleep(2 * time.Second)
+
+		err = cmd.Wait()
+		if err != nil {
+			GinkgoWriter.Printf("Process with PID %d terminated with error: %v\n", cmd.Process.Pid, err)
+		} else {
+			GinkgoWriter.Printf("Process with PID %d terminated successfully\n", cmd.Process.Pid)
+		}
+
 		err = deleteClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")
 	})

From 5395aed16048c16ec7b04d5d7c80194d4b88a507 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 24 Jun 2024 16:51:42 +0800
Subject: [PATCH 041/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 18a4a4a2..0250fc36 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -54,11 +54,7 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 		time.Sleep(2 * time.Second)
 
 		err = cmd.Wait()
-		if err != nil {
-			GinkgoWriter.Printf("Process with PID %d terminated with error: %v\n", cmd.Process.Pid, err)
-		} else {
-			GinkgoWriter.Printf("Process with PID %d terminated successfully\n", cmd.Process.Pid)
-		}
+		Expect(err).NotTo(HaveOccurred(), "failed to wait process to be killed")
 
 		err = deleteClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")
@@ -72,13 +68,6 @@ func newCreateClusterinBaremetalCommand() exec.Cmd {
 	return *cmd
 }
 
-func createClusterinBaremetal(cmd exec.Cmd) error {
-	if err := cmd.Start(); err != nil {
-		return err
-	}
-	return nil
-}
-
 func getClusterinBaremetal() error {
 	cmd := exec.Command("../../bin/gtctl", "cluster", "get", "mydb", "--bare-metal")
 	cmd.Stdout = os.Stdout

From 5dba756f43bc67ffecb9ac8853e01a6e385f1208 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 24 Jun 2024 17:07:46 +0800
Subject: [PATCH 042/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 0250fc36..7779863d 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -29,9 +29,9 @@ import (
 var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 	It("Bootstrap cluster in baremteal", func() {
 		var err error
-		cmd := newCreateClusterinBaremetalCommand()
+		createcmd := newCreateClusterinBaremetalCommand()
 
-		err = cmd.Start()
+		err = createcmd.Start()
 		Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
 
 		for {
@@ -44,16 +44,14 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 		err = getClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
 
-		if cmd.Process != nil {
-			err = cmd.Process.Kill()
+		if createcmd.Process != nil {
+			err = createcmd.Process.Kill()
 			Expect(err).NotTo(HaveOccurred(), "failed to kill create cluster process")
 		} else {
 			Fail("process is not properly initialized")
 		}
 
-		time.Sleep(2 * time.Second)
-
-		err = cmd.Wait()
+		err = createcmd.Wait()
 		Expect(err).NotTo(HaveOccurred(), "failed to wait process to be killed")
 
 		err = deleteClusterinBaremetal()

From 15e7a2d3b1366198784593ff760f0d6d976e9e95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 24 Jun 2024 17:08:34 +0800
Subject: [PATCH 043/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 7779863d..c8c5e2ca 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -52,7 +52,12 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 		}
 
 		err = createcmd.Wait()
-		Expect(err).NotTo(HaveOccurred(), "failed to wait process to be killed")
+		err = createcmd.Wait()
+		if err != nil {
+			GinkgoWriter.Printf("Process with PID %d terminated with error: %v\n", cmd.Process.Pid, err)
+		} else {
+			GinkgoWriter.Printf("Process with PID %d terminated successfully\n", cmd.Process.Pid)
+		}
 
 		err = deleteClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")

From 36e834ba96e9ffc90c94b2906a025805faa4e6cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 24 Jun 2024 17:10:19 +0800
Subject: [PATCH 044/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index c8c5e2ca..d2c55723 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -54,9 +54,9 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 		err = createcmd.Wait()
 		err = createcmd.Wait()
 		if err != nil {
-			GinkgoWriter.Printf("Process with PID %d terminated with error: %v\n", cmd.Process.Pid, err)
+			GinkgoWriter.Printf("Process with PID %d terminated with error: %v\n", createcmd.Process.Pid, err)
 		} else {
-			GinkgoWriter.Printf("Process with PID %d terminated successfully\n", cmd.Process.Pid)
+			GinkgoWriter.Printf("Process with PID %d terminated successfully\n", createcmd.Process.Pid)
 		}
 
 		err = deleteClusterinBaremetal()

From 3868fdede93e218b895513a72d7b77bda504beb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 24 Jun 2024 17:15:00 +0800
Subject: [PATCH 045/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index d2c55723..9252a831 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -51,7 +51,6 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 			Fail("process is not properly initialized")
 		}
 
-		err = createcmd.Wait()
 		err = createcmd.Wait()
 		if err != nil {
 			GinkgoWriter.Printf("Process with PID %d terminated with error: %v\n", createcmd.Process.Pid, err)

From ca70fd63a76eb354eb1ca212dbd19707cbf94931 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 24 Jun 2024 18:01:27 +0800
Subject: [PATCH 046/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 9252a831..0412d8ac 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -53,9 +53,9 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 
 		err = createcmd.Wait()
 		if err != nil {
-			GinkgoWriter.Printf("Process with PID %d terminated with error: %v\n", createcmd.Process.Pid, err)
+			GinkgoWriter.Printf("Process with PID  terminated with error: \n")
 		} else {
-			GinkgoWriter.Printf("Process with PID %d terminated successfully\n", createcmd.Process.Pid)
+			GinkgoWriter.Printf("Process with PIDterminated successfully\n")
 		}
 
 		err = deleteClusterinBaremetal()

From 71befb3fd797a1523bced1370e65a60ce45366ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 24 Jun 2024 18:19:25 +0800
Subject: [PATCH 047/108] fix11

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 0412d8ac..ea9f2bb2 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -52,11 +52,9 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 		}
 
 		err = createcmd.Wait()
-		if err != nil {
-			GinkgoWriter.Printf("Process with PID  terminated with error: \n")
-		} else {
-			GinkgoWriter.Printf("Process with PIDterminated successfully\n")
-		}
+		Expect(err).NotTo(HaveOccurred(), "failed to wait process to be killed")
+
+		GinkgoWriter.Print("123")
 
 		err = deleteClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")

From 1d54fefaad5b4a45d4ae6eab10a53cde818f1d73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 24 Jun 2024 18:27:19 +0800
Subject: [PATCH 048/108] fix12

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index ea9f2bb2..7779863d 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -54,8 +54,6 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 		err = createcmd.Wait()
 		Expect(err).NotTo(HaveOccurred(), "failed to wait process to be killed")
 
-		GinkgoWriter.Print("123")
-
 		err = deleteClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")
 	})

From 98638d7284dca4e9fd0262bf9e9941b242e9fd84 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, 25 Jun 2024 11:14:12 +0800
Subject: [PATCH 049/108] fix13

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 8 ++++----
 tests/e2e/greptimedbcluster_test.go           | 7 +++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 7779863d..3266dcd2 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -30,10 +30,10 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 	It("Bootstrap cluster in baremteal", func() {
 		var err error
 		createcmd := newCreateClusterinBaremetalCommand()
-
-		err = createcmd.Start()
-		Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
-
+		go func() {
+			err = createcmd.Run()
+			Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
+		}()
 		for {
 			if conn, err := net.DialTimeout("tcp", "localhost:4000", 2*time.Second); err == nil {
 				defer conn.Close()
diff --git a/tests/e2e/greptimedbcluster_test.go b/tests/e2e/greptimedbcluster_test.go
index 30b35f2d..e840d104 100644
--- a/tests/e2e/greptimedbcluster_test.go
+++ b/tests/e2e/greptimedbcluster_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package e2e
+/*package e2e
 
 import (
 	"context"
@@ -24,10 +24,10 @@ import (
 	"os/exec"
 	"time"
 
+	"github.com/go-sql-driver/mysql"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	"github.com/go-sql-driver/mysql"
 	"k8s.io/klog/v2"
 )
 
@@ -190,3 +190,6 @@ func forwardRequest() {
 		}
 	}
 }
+*/
+
+package e2e

From 1d3d4c28aee62a3eadecc28c842a30fdaa9568ef 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, 25 Jun 2024 11:14:40 +0800
Subject: [PATCH 050/108] fix13

---
 tests/e2e/greptimedbcluster_test.go | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_test.go b/tests/e2e/greptimedbcluster_test.go
index e840d104..8150bd5f 100644
--- a/tests/e2e/greptimedbcluster_test.go
+++ b/tests/e2e/greptimedbcluster_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*package e2e
+package e2e
 
 import (
 	"context"
@@ -190,6 +190,3 @@ func forwardRequest() {
 		}
 	}
 }
-*/
-
-package e2e

From 7429d48eae5469ee8516bdbc69b7fe81f3853849 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, 25 Jun 2024 11:24:38 +0800
Subject: [PATCH 051/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 3266dcd2..7779863d 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -30,10 +30,10 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 	It("Bootstrap cluster in baremteal", func() {
 		var err error
 		createcmd := newCreateClusterinBaremetalCommand()
-		go func() {
-			err = createcmd.Run()
-			Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
-		}()
+
+		err = createcmd.Start()
+		Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
+
 		for {
 			if conn, err := net.DialTimeout("tcp", "localhost:4000", 2*time.Second); err == nil {
 				defer conn.Close()

From f6dc85d1867db4ca5cceb04202c58267b76f69b0 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, 25 Jun 2024 11:40:32 +0800
Subject: [PATCH 052/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 7779863d..eec62f9e 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -51,8 +51,14 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 			Fail("process is not properly initialized")
 		}
 
-		err = createcmd.Wait()
-		Expect(err).NotTo(HaveOccurred(), "failed to wait process to be killed")
+		waitErr := createcmd.Wait()
+		if waitErr != nil {
+			if _, ok := waitErr.(*exec.ExitError); ok {
+				GinkgoWriter.Printf("Process with PID %d terminated successfully\n", createcmd.Process.Pid)
+			} else {
+				GinkgoWriter.Printf("Process with PID %d terminated with unexpected error: %v\n", createcmd.Process.Pid, waitErr)
+			}
+		}
 
 		err = deleteClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")

From d856ccfb8cf26a12e4423242c9c8579297a480de 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, 25 Jun 2024 11:52:01 +0800
Subject: [PATCH 053/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index eec62f9e..7aaed758 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -54,9 +54,9 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 		waitErr := createcmd.Wait()
 		if waitErr != nil {
 			if _, ok := waitErr.(*exec.ExitError); ok {
-				GinkgoWriter.Printf("Process with PID %d terminated successfully\n", createcmd.Process.Pid)
+				GinkgoWriter.Printf("Process terminated successfully\n")
 			} else {
-				GinkgoWriter.Printf("Process with PID %d terminated with unexpected error: %v\n", createcmd.Process.Pid, waitErr)
+				GinkgoWriter.Printf("Process terminated with unexpected error: %v\n", waitErr)
 			}
 		}
 

From 21d1c8e429416aed8540b11bef19d7edc37c5381 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, 25 Jun 2024 12:01:12 +0800
Subject: [PATCH 054/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 7aaed758..ce3bbf1b 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -56,7 +56,7 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 			if _, ok := waitErr.(*exec.ExitError); ok {
 				GinkgoWriter.Printf("Process terminated successfully\n")
 			} else {
-				GinkgoWriter.Printf("Process terminated with unexpected error: %v\n", waitErr)
+				GinkgoWriter.Printf("Process terminated with unexpected error1: %v\n", waitErr)
 			}
 		}
 

From 2ee7b5ab0c17d2c63798e5c78ad7d58388810c8c 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, 25 Jun 2024 12:08:34 +0800
Subject: [PATCH 055/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index ce3bbf1b..7aaed758 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -56,7 +56,7 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 			if _, ok := waitErr.(*exec.ExitError); ok {
 				GinkgoWriter.Printf("Process terminated successfully\n")
 			} else {
-				GinkgoWriter.Printf("Process terminated with unexpected error1: %v\n", waitErr)
+				GinkgoWriter.Printf("Process terminated with unexpected error: %v\n", waitErr)
 			}
 		}
 

From fb4a186ba8b5b425ad4e522179ae7ce7c5532931 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, 25 Jun 2024 12:23:54 +0800
Subject: [PATCH 056/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 7aaed758..c90a59ad 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -56,7 +56,7 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 			if _, ok := waitErr.(*exec.ExitError); ok {
 				GinkgoWriter.Printf("Process terminated successfully\n")
 			} else {
-				GinkgoWriter.Printf("Process terminated with unexpected error: %v\n", waitErr)
+				GinkgoWriter.Printf("Proces terminated with unexpected error: %v\n", waitErr)
 			}
 		}
 

From 37802284fcaa71790d1d097c2a50d560f73475d1 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, 25 Jun 2024 14:55:09 +0800
Subject: [PATCH 057/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index c90a59ad..7aaed758 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -56,7 +56,7 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 			if _, ok := waitErr.(*exec.ExitError); ok {
 				GinkgoWriter.Printf("Process terminated successfully\n")
 			} else {
-				GinkgoWriter.Printf("Proces terminated with unexpected error: %v\n", waitErr)
+				GinkgoWriter.Printf("Process terminated with unexpected error: %v\n", waitErr)
 			}
 		}
 

From f4fb200663ef3ae28370751bc327289357009885 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, 25 Jun 2024 15:05:14 +0800
Subject: [PATCH 058/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 7aaed758..c90a59ad 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -56,7 +56,7 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 			if _, ok := waitErr.(*exec.ExitError); ok {
 				GinkgoWriter.Printf("Process terminated successfully\n")
 			} else {
-				GinkgoWriter.Printf("Process terminated with unexpected error: %v\n", waitErr)
+				GinkgoWriter.Printf("Proces terminated with unexpected error: %v\n", waitErr)
 			}
 		}
 

From d5dd3058488b29e4221796c427b36d2656102324 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, 25 Jun 2024 15:08:50 +0800
Subject: [PATCH 059/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index c90a59ad..0db021eb 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -56,7 +56,7 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 			if _, ok := waitErr.(*exec.ExitError); ok {
 				GinkgoWriter.Printf("Process terminated successfully\n")
 			} else {
-				GinkgoWriter.Printf("Proces terminated with unexpected error: %v\n", waitErr)
+				GinkgoWriter.Printf("Process terminated with error: %v\n", waitErr)
 			}
 		}
 

From 2476fab62cfd4a1b100a2e9f7138de22825d0897 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, 25 Jun 2024 15:29:28 +0800
Subject: [PATCH 060/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 0db021eb..2a5e8d4c 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -58,6 +58,8 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 			} else {
 				GinkgoWriter.Printf("Process terminated with error: %v\n", waitErr)
 			}
+		} else {
+			GinkgoWriter.Printf("Process terminated with error:")
 		}
 
 		err = deleteClusterinBaremetal()

From c1fcddcbdc9c67614dd9caa15fb3f0ea79d5eb2e 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, 25 Jun 2024 16:14:37 +0800
Subject: [PATCH 061/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 2a5e8d4c..eb6d027c 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -53,13 +53,13 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 
 		waitErr := createcmd.Wait()
 		if waitErr != nil {
-			if _, ok := waitErr.(*exec.ExitError); ok {
-				GinkgoWriter.Printf("Process terminated successfully\n")
+			if exitErr, ok := waitErr.(*exec.ExitError); ok {
+				GinkgoWriter.Printf("Process was killed with signal: %v\n", exitErr)
 			} else {
 				GinkgoWriter.Printf("Process terminated with error: %v\n", waitErr)
 			}
 		} else {
-			GinkgoWriter.Printf("Process terminated with error:")
+			GinkgoWriter.Printf("Process terminated successfully\n")
 		}
 
 		err = deleteClusterinBaremetal()

From d07866071a06719b62be496c2a320faec8fa45b7 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, 25 Jun 2024 16:29:16 +0800
Subject: [PATCH 062/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index eb6d027c..80550f5b 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -36,6 +36,7 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 
 		for {
 			if conn, err := net.DialTimeout("tcp", "localhost:4000", 2*time.Second); err == nil {
+				GinkgoWriter.Printf("the create action is successed\n")
 				defer conn.Close()
 				break
 			}

From f7ba7e96880423b506733fc948716f72201d9c97 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, 25 Jun 2024 16:39:00 +0800
Subject: [PATCH 063/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 80550f5b..3478203a 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -36,7 +36,7 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 
 		for {
 			if conn, err := net.DialTimeout("tcp", "localhost:4000", 2*time.Second); err == nil {
-				GinkgoWriter.Printf("the create action is successed\n")
+				GinkgoWriter.Printf("the create action is succeeded\n")
 				defer conn.Close()
 				break
 			}

From 8706ef820e0c060c47d17d3915ea173ba0f84c57 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, 25 Jun 2024 16:46:39 +0800
Subject: [PATCH 064/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 3478203a..b0393262 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -36,7 +36,7 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 
 		for {
 			if conn, err := net.DialTimeout("tcp", "localhost:4000", 2*time.Second); err == nil {
-				GinkgoWriter.Printf("the create action is succeeded\n")
+				GinkgoWriter.Printf("The create action is succeeded\n")
 				defer conn.Close()
 				break
 			}

From d73bdab12cd05b6902a4fa21ffdf2c8af42bad3d 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, 25 Jun 2024 17:12:38 +0800
Subject: [PATCH 065/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index b0393262..9b79008a 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -36,7 +36,7 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 
 		for {
 			if conn, err := net.DialTimeout("tcp", "localhost:4000", 2*time.Second); err == nil {
-				GinkgoWriter.Printf("The create action is succeeded\n")
+				GinkgoWriter.Printf("the create action is succeeded\n")
 				defer conn.Close()
 				break
 			}
@@ -55,12 +55,12 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 		waitErr := createcmd.Wait()
 		if waitErr != nil {
 			if exitErr, ok := waitErr.(*exec.ExitError); ok {
-				GinkgoWriter.Printf("Process was killed with signal: %v\n", exitErr)
+				GinkgoWriter.Printf("process was killed with signal: %v\n", exitErr)
 			} else {
-				GinkgoWriter.Printf("Process terminated with error: %v\n", waitErr)
+				GinkgoWriter.Printf("process terminated with error: %v\n", waitErr)
 			}
 		} else {
-			GinkgoWriter.Printf("Process terminated successfully\n")
+			GinkgoWriter.Printf("process terminated successfully\n")
 		}
 
 		err = deleteClusterinBaremetal()
@@ -69,14 +69,14 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 })
 
 func newCreateClusterinBaremetalCommand() exec.Cmd {
-	cmd := exec.Command("../../bin/gtctl", "cluster", "create", "mydb", "--bare-metal")
+	cmd := exec.Command("../../bin/gtctl", "cluster", "create", "mycluster", "--bare-metal")
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	return *cmd
 }
 
 func getClusterinBaremetal() error {
-	cmd := exec.Command("../../bin/gtctl", "cluster", "get", "mydb", "--bare-metal")
+	cmd := exec.Command("../../bin/gtctl", "cluster", "get", "mycluster", "--bare-metal")
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	if err := cmd.Run(); err != nil {
@@ -86,7 +86,7 @@ func getClusterinBaremetal() error {
 }
 
 func deleteClusterinBaremetal() error {
-	cmd := exec.Command("../../bin/gtctl", "cluster", "delete", "mydb", "--tear-down-etcd", "--bare-metal")
+	cmd := exec.Command("../../bin/gtctl", "cluster", "delete", "mycluster", "--tear-down-etcd", "--bare-metal")
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	if err := cmd.Run(); err != nil {

From deb5dc7385366aa2004837c242be546508498395 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, 25 Jun 2024 17:24:22 +0800
Subject: [PATCH 066/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 9b79008a..4a556321 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -33,10 +33,10 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 
 		err = createcmd.Start()
 		Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
+		GinkgoWriter.Printf("the create action is succeeded\n")
 
 		for {
 			if conn, err := net.DialTimeout("tcp", "localhost:4000", 2*time.Second); err == nil {
-				GinkgoWriter.Printf("the create action is succeeded\n")
 				defer conn.Close()
 				break
 			}

From 656891bd65cfc28c6c01cdebfee8bd112ecc16d0 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, 25 Jun 2024 17:59:04 +0800
Subject: [PATCH 067/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 4a556321..cc52716b 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -33,7 +33,6 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 
 		err = createcmd.Start()
 		Expect(err).NotTo(HaveOccurred(), "failed to create cluster in baremetal")
-		GinkgoWriter.Printf("the create action is succeeded\n")
 
 		for {
 			if conn, err := net.DialTimeout("tcp", "localhost:4000", 2*time.Second); err == nil {
@@ -52,16 +51,8 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 			Fail("process is not properly initialized")
 		}
 
-		waitErr := createcmd.Wait()
-		if waitErr != nil {
-			if exitErr, ok := waitErr.(*exec.ExitError); ok {
-				GinkgoWriter.Printf("process was killed with signal: %v\n", exitErr)
-			} else {
-				GinkgoWriter.Printf("process terminated with error: %v\n", waitErr)
-			}
-		} else {
-			GinkgoWriter.Printf("process terminated successfully\n")
-		}
+		err = createcmd.Wait()
+		Expect(err).To(HaveOccurred(), "process is terminated sucessfully")
 
 		err = deleteClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")

From fd4ffb82fa9ab2cdd799ac6b93206b003e232f29 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, 25 Jun 2024 18:01:13 +0800
Subject: [PATCH 068/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index cc52716b..b76c3101 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -52,7 +52,7 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 		}
 
 		err = createcmd.Wait()
-		Expect(err).To(HaveOccurred(), "process is terminated sucessfully")
+		Expect(err).To(HaveOccurred(), "process is terminated successfully")
 
 		err = deleteClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")

From 5a54f7d6708b2282751b812098bd2de0a31606df 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, 25 Jun 2024 18:18:01 +0800
Subject: [PATCH 069/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index b76c3101..bb326b74 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -52,7 +52,7 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 		}
 
 		err = createcmd.Wait()
-		Expect(err).To(HaveOccurred(), "process is terminated successfully")
+		Expect(err).To(HaveOccurred(), "process is terminated successfully.")
 
 		err = deleteClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")

From d6a5ee31c1d9be34c8339982ff0730b1097f37fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Wed, 26 Jun 2024 11:03:13 +0800
Subject: [PATCH 070/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index bb326b74..6e38fc59 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -51,8 +51,7 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 			Fail("process is not properly initialized")
 		}
 
-		err = createcmd.Wait()
-		Expect(err).To(HaveOccurred(), "process is terminated successfully.")
+		createcmd.Wait()
 
 		err = deleteClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")

From 468ab6ae6888f28798e28efb7977f2f2e688b62d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Wed, 26 Jun 2024 11:14:05 +0800
Subject: [PATCH 071/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 6e38fc59..9c564e7d 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -51,7 +51,12 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 			Fail("process is not properly initialized")
 		}
 
-		createcmd.Wait()
+		err = createcmd.Wait()
+		if _, ok := err.(*exec.ExitError); ok {
+			GinkgoWriter.Printf("the process is terminated successfully\n")
+		} else {
+			GinkgoWriter.Printf("failed to terminate the process\n")
+		}
 
 		err = deleteClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")

From 2f16d46a16d6669e361c2afb0856cafb862095a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Wed, 26 Jun 2024 11:26:22 +0800
Subject: [PATCH 072/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 9c564e7d..bc716a0b 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -52,10 +52,14 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 		}
 
 		err = createcmd.Wait()
-		if _, ok := err.(*exec.ExitError); ok {
-			GinkgoWriter.Printf("the process is terminated successfully\n")
+		if err != nil {
+			if exitErr, ok := err.(*exec.ExitError); ok {
+				GinkgoWriter.Printf("Process was killed with signal: %v,the process is terminated successfully\n", exitErr)
+			} else {
+				GinkgoWriter.Printf("Process terminated with error: %v,failed to terminater the process\n", err)
+			}
 		} else {
-			GinkgoWriter.Printf("failed to terminate the process\n")
+			GinkgoWriter.Printf("failed to terminater the process\n")
 		}
 
 		err = deleteClusterinBaremetal()

From 5f37a4b67b8600f7000f1f2c1a75ceb1635f5616 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Wed, 26 Jun 2024 11:29:04 +0800
Subject: [PATCH 073/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index bc716a0b..18e7359a 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -56,10 +56,10 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 			if exitErr, ok := err.(*exec.ExitError); ok {
 				GinkgoWriter.Printf("Process was killed with signal: %v,the process is terminated successfully\n", exitErr)
 			} else {
-				GinkgoWriter.Printf("Process terminated with error: %v,failed to terminater the process\n", err)
+				GinkgoWriter.Printf("Process terminated with error: %v,failed to terminated the process\n", err)
 			}
 		} else {
-			GinkgoWriter.Printf("failed to terminater the process\n")
+			GinkgoWriter.Printf("failed to terminated the process\n")
 		}
 
 		err = deleteClusterinBaremetal()

From ede1032c4dc0a3d7be45d7217a29a6457be58b55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Wed, 26 Jun 2024 11:46:28 +0800
Subject: [PATCH 074/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 18e7359a..6d4c9b87 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -54,7 +54,7 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 		err = createcmd.Wait()
 		if err != nil {
 			if exitErr, ok := err.(*exec.ExitError); ok {
-				GinkgoWriter.Printf("Process was killed with signal: %v,the process is terminated successfully\n", exitErr)
+				GinkgoWriter.Printf("Process was killed with signal: %v,the process is terminated\n", exitErr)
 			} else {
 				GinkgoWriter.Printf("Process terminated with error: %v,failed to terminated the process\n", err)
 			}

From 8c3495a64325a21f1bff2af7f2abcde7acaa63bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 28 Jun 2024 14:34:43 +0800
Subject: [PATCH 075/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 6d4c9b87..efbbc7f5 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -17,6 +17,8 @@
 package e2e
 
 import (
+	"fmt"
+	"io"
 	"net"
 	"os"
 	"os/exec"
@@ -41,6 +43,18 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 			}
 		}
 
+		logFile, err := os.Open("/home/.gtctl/mycluster/logs/frontend.0/log")
+		if err != nil {
+			fmt.Printf("Failed to open log file: %v\n", err)
+			return
+		}
+		defer logFile.Close()
+
+		// 将文件内容拷贝到标准输出
+		if _, err := io.Copy(os.Stdout, logFile); err != nil {
+			fmt.Printf("Failed to copy log file content to stdout: %v\n", err)
+		}
+
 		err = getClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
 

From 7301c86a9ca9f0c37f33452c663b2c938e2a0ddf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 28 Jun 2024 14:43:35 +0800
Subject: [PATCH 076/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index efbbc7f5..348a8737 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -43,7 +43,7 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 			}
 		}
 
-		logFile, err := os.Open("/home/.gtctl/mycluster/logs/frontend.0/log")
+		logFile, err := os.Open("/home/runner/.gtctl/mycluster/logs/frontend.0/log")
 		if err != nil {
 			fmt.Printf("Failed to open log file: %v\n", err)
 			return

From b279748409f5938808e84e5675a77e7fb00e4bf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 28 Jun 2024 14:49:59 +0800
Subject: [PATCH 077/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 348a8737..0e4b9450 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -68,9 +68,9 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 		err = createcmd.Wait()
 		if err != nil {
 			if exitErr, ok := err.(*exec.ExitError); ok {
-				GinkgoWriter.Printf("Process was killed with signal: %v,the process is terminated\n", exitErr)
+				GinkgoWriter.Printf("process was killed with signal: %v,the process is terminated\n", exitErr)
 			} else {
-				GinkgoWriter.Printf("Process terminated with error: %v,failed to terminated the process\n", err)
+				GinkgoWriter.Printf("process terminated with error: %v,failed to terminated the process\n", err)
 			}
 		} else {
 			GinkgoWriter.Printf("failed to terminated the process\n")

From 21751b4a07885503a20dcfe5210049cb30347571 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 28 Jun 2024 15:02:36 +0800
Subject: [PATCH 078/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 0e4b9450..348a8737 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -68,9 +68,9 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 		err = createcmd.Wait()
 		if err != nil {
 			if exitErr, ok := err.(*exec.ExitError); ok {
-				GinkgoWriter.Printf("process was killed with signal: %v,the process is terminated\n", exitErr)
+				GinkgoWriter.Printf("Process was killed with signal: %v,the process is terminated\n", exitErr)
 			} else {
-				GinkgoWriter.Printf("process terminated with error: %v,failed to terminated the process\n", err)
+				GinkgoWriter.Printf("Process terminated with error: %v,failed to terminated the process\n", err)
 			}
 		} else {
 			GinkgoWriter.Printf("failed to terminated the process\n")

From 308a24c1451610ab702b94dc3275f7a443bb81d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 28 Jun 2024 15:20:47 +0800
Subject: [PATCH 079/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 348a8737..2a08f055 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -62,7 +62,7 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 			err = createcmd.Process.Kill()
 			Expect(err).NotTo(HaveOccurred(), "failed to kill create cluster process")
 		} else {
-			Fail("process is not properly initialized")
+			Fail("Process is not properly initialized")
 		}
 
 		err = createcmd.Wait()

From e5b6383e7c119255463902c08be6f716d07c7ac4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 28 Jun 2024 15:42:58 +0800
Subject: [PATCH 080/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 2a08f055..be1d04a6 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -43,6 +43,9 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 			}
 		}
 
+		err = getClusterinBaremetal()
+		Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
+
 		logFile, err := os.Open("/home/runner/.gtctl/mycluster/logs/frontend.0/log")
 		if err != nil {
 			fmt.Printf("Failed to open log file: %v\n", err)
@@ -55,9 +58,6 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 			fmt.Printf("Failed to copy log file content to stdout: %v\n", err)
 		}
 
-		err = getClusterinBaremetal()
-		Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
-
 		if createcmd.Process != nil {
 			err = createcmd.Process.Kill()
 			Expect(err).NotTo(HaveOccurred(), "failed to kill create cluster process")

From 5bc53287bed9fe79c62ac503fce0d4a286aa653e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 28 Jun 2024 15:58:54 +0800
Subject: [PATCH 081/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index be1d04a6..05f5eab0 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -17,6 +17,8 @@
 package e2e
 
 import (
+	"context"
+	"database/sql"
 	"fmt"
 	"io"
 	"net"
@@ -24,6 +26,7 @@ import (
 	"os/exec"
 	"time"
 
+	"github.com/go-sql-driver/mysql"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
@@ -76,6 +79,63 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 			GinkgoWriter.Printf("failed to terminated the process\n")
 		}
 
+		By("Connecting GreptimeDB")
+		var db *sql.DB
+		var conn *sql.Conn
+
+		Eventually(func() error {
+			cfg := mysql.Config{
+				Net:                  "tcp",
+				Addr:                 "127.0.0.1:4002",
+				User:                 "",
+				Passwd:               "",
+				DBName:               "",
+				AllowNativePasswords: true,
+			}
+
+			db, err = sql.Open("mysql", cfg.FormatDSN())
+			if err != nil {
+				return err
+			}
+
+			conn, err = db.Conn(context.TODO())
+			if err != nil {
+				return err
+			}
+
+			return nil
+		}, 30*time.Second, time.Second).ShouldNot(HaveOccurred())
+
+		By("Execute SQL queries after connecting")
+
+		ctx, cancel := context.WithTimeout(context.Background(), defaultQueryTimeout)
+		defer cancel()
+
+		_, err = conn.ExecContext(ctx, createTableSQL)
+		Expect(err).NotTo(HaveOccurred(), "failed to create SQL table")
+
+		ctx, cancel = context.WithTimeout(context.Background(), defaultQueryTimeout)
+		defer cancel()
+		for rowID := 1; rowID <= testRowIDNum; rowID++ {
+			insertDataSQL := fmt.Sprintf(insertDataSQLStr, rowID, rowID)
+			_, err = conn.ExecContext(ctx, insertDataSQL)
+			Expect(err).NotTo(HaveOccurred(), "failed to insert data")
+		}
+
+		ctx, cancel = context.WithTimeout(context.Background(), defaultQueryTimeout)
+		defer cancel()
+		results, err := conn.QueryContext(ctx, selectDataSQL)
+		Expect(err).NotTo(HaveOccurred(), "failed to get data")
+
+		var data []TestData
+		for results.Next() {
+			var d TestData
+			err = results.Scan(&d.timestamp, &d.n, &d.rowID)
+			Expect(err).NotTo(HaveOccurred(), "failed to scan data that query from db")
+			data = append(data, d)
+		}
+		Expect(len(data) == testRowIDNum).Should(BeTrue(), "get the wrong data from db")
+
 		err = deleteClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")
 	})

From 61b60ead8577192cff9b2d36b63dd09e5b588b5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 28 Jun 2024 16:19:42 +0800
Subject: [PATCH 082/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 60 -------------------
 1 file changed, 60 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 05f5eab0..be1d04a6 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -17,8 +17,6 @@
 package e2e
 
 import (
-	"context"
-	"database/sql"
 	"fmt"
 	"io"
 	"net"
@@ -26,7 +24,6 @@ import (
 	"os/exec"
 	"time"
 
-	"github.com/go-sql-driver/mysql"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
@@ -79,63 +76,6 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
 			GinkgoWriter.Printf("failed to terminated the process\n")
 		}
 
-		By("Connecting GreptimeDB")
-		var db *sql.DB
-		var conn *sql.Conn
-
-		Eventually(func() error {
-			cfg := mysql.Config{
-				Net:                  "tcp",
-				Addr:                 "127.0.0.1:4002",
-				User:                 "",
-				Passwd:               "",
-				DBName:               "",
-				AllowNativePasswords: true,
-			}
-
-			db, err = sql.Open("mysql", cfg.FormatDSN())
-			if err != nil {
-				return err
-			}
-
-			conn, err = db.Conn(context.TODO())
-			if err != nil {
-				return err
-			}
-
-			return nil
-		}, 30*time.Second, time.Second).ShouldNot(HaveOccurred())
-
-		By("Execute SQL queries after connecting")
-
-		ctx, cancel := context.WithTimeout(context.Background(), defaultQueryTimeout)
-		defer cancel()
-
-		_, err = conn.ExecContext(ctx, createTableSQL)
-		Expect(err).NotTo(HaveOccurred(), "failed to create SQL table")
-
-		ctx, cancel = context.WithTimeout(context.Background(), defaultQueryTimeout)
-		defer cancel()
-		for rowID := 1; rowID <= testRowIDNum; rowID++ {
-			insertDataSQL := fmt.Sprintf(insertDataSQLStr, rowID, rowID)
-			_, err = conn.ExecContext(ctx, insertDataSQL)
-			Expect(err).NotTo(HaveOccurred(), "failed to insert data")
-		}
-
-		ctx, cancel = context.WithTimeout(context.Background(), defaultQueryTimeout)
-		defer cancel()
-		results, err := conn.QueryContext(ctx, selectDataSQL)
-		Expect(err).NotTo(HaveOccurred(), "failed to get data")
-
-		var data []TestData
-		for results.Next() {
-			var d TestData
-			err = results.Scan(&d.timestamp, &d.n, &d.rowID)
-			Expect(err).NotTo(HaveOccurred(), "failed to scan data that query from db")
-			data = append(data, d)
-		}
-		Expect(len(data) == testRowIDNum).Should(BeTrue(), "get the wrong data from db")
-
 		err = deleteClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")
 	})

From 6bc0b949715fb7869bb87f8fe7dc7f502098eee8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 28 Jun 2024 18:41:32 +0800
Subject: [PATCH 083/108] fix

---
 tests/e2e/greptimedbcluster_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_test.go b/tests/e2e/greptimedbcluster_test.go
index 8150bd5f..ec523772 100644
--- a/tests/e2e/greptimedbcluster_test.go
+++ b/tests/e2e/greptimedbcluster_test.go
@@ -86,7 +86,7 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 		Eventually(func() error {
 			cfg := mysql.Config{
 				Net:                  "tcp",
-				Addr:                 "127.0.0.1:4002",
+				Addr:                 "127.0.0.1:4003",
 				User:                 "",
 				Passwd:               "",
 				DBName:               "",
@@ -183,7 +183,7 @@ func deleteCluster() error {
 
 func forwardRequest() {
 	for {
-		cmd := exec.Command("kubectl", "port-forward", "svc/mydb-frontend", "4002:4002")
+		cmd := exec.Command("kubectl", "port-forward", "svc/mydb-frontend", "4003:4003")
 		if err := cmd.Run(); err != nil {
 			klog.Errorf("Failed to port forward: %v", err)
 			return

From 6d9497c85079dd3659804bf6f7045545c3604382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 1 Jul 2024 11:28:27 +0800
Subject: [PATCH 084/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 60 ++++++++++++++++++-
 tests/e2e/greptimedbcluster_test.go           |  4 +-
 2 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index be1d04a6..1b63d016 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -17,18 +17,28 @@
 package e2e
 
 import (
+	"bytes"
 	"fmt"
 	"io"
 	"net"
 	"os"
 	"os/exec"
+	"strconv"
+	"strings"
 	"time"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
-var _ = Describe("Basic test of greptimedb cluster in baremetal", func() {
+var _ = Describe("Basic test of greptimedb cluster in baremetal", Ordered, func() {
+	BeforeEach(func() {
+		ports := []int{4000, 4001, 4002, 4003}
+		for _, port := range ports {
+			err := checkAndClosePort(port)
+			Expect(err).NotTo(HaveOccurred(), fmt.Sprintf("failed to close port %d", port))
+		}
+	})
 	It("Bootstrap cluster in baremteal", func() {
 		var err error
 		createcmd := newCreateClusterinBaremetalCommand()
@@ -107,3 +117,51 @@ func deleteClusterinBaremetal() error {
 	}
 	return nil
 }
+
+func checkPortInUse(port int) (bool, int, error) {
+	cmd := exec.Command("lsof", "-i", fmt.Sprintf(":%d", port))
+	var out bytes.Buffer
+	cmd.Stdout = &out
+	err := cmd.Run()
+	if err != nil {
+		return false, 0, err
+	}
+
+	if out.Len() == 0 {
+		return false, 0, nil
+	}
+
+	lines := strings.Split(out.String(), "\n")
+	if len(lines) > 1 {
+		fields := strings.Fields(lines[1])
+		if len(fields) > 1 {
+			pid, err := strconv.Atoi(fields[1])
+			if err != nil {
+				return false, 0, err
+			}
+			return true, pid, nil
+		}
+	}
+	return false, 0, nil
+}
+
+// killProcess kills a process by its PID
+func killProcess(pid int) error {
+	cmd := exec.Command("kill", "-9", strconv.Itoa(pid))
+	return cmd.Run()
+}
+
+// checkAndClosePort checks if a port is in use and closes it
+func checkAndClosePort(port int) error {
+	inUse, pid, err := checkPortInUse(port)
+	if err != nil {
+		return err
+	}
+
+	if inUse {
+		fmt.Printf("Port %d is in use by process %d, terminating process\n", port, pid)
+		return killProcess(pid)
+	}
+	fmt.Printf("Port %d is not in use\n", port)
+	return nil
+}
diff --git a/tests/e2e/greptimedbcluster_test.go b/tests/e2e/greptimedbcluster_test.go
index ec523772..07626f87 100644
--- a/tests/e2e/greptimedbcluster_test.go
+++ b/tests/e2e/greptimedbcluster_test.go
@@ -63,7 +63,7 @@ type TestData struct {
 	rowID     int32
 }
 
-var _ = Describe("Basic test of greptimedb cluster", func() {
+var _ = Describe("Basic test of greptimedb cluster", Ordered, func() {
 	It("Bootstrap cluster", func() {
 		var err error
 		err = createCluster()
@@ -86,7 +86,7 @@ var _ = Describe("Basic test of greptimedb cluster", func() {
 		Eventually(func() error {
 			cfg := mysql.Config{
 				Net:                  "tcp",
-				Addr:                 "127.0.0.1:4003",
+				Addr:                 "127.0.0.1:4002",
 				User:                 "",
 				Passwd:               "",
 				DBName:               "",

From a4828883c9150b6e064f64fbc8e829a8655784b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 1 Jul 2024 12:35:37 +0800
Subject: [PATCH 085/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 1b63d016..1668b932 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -33,11 +33,8 @@ import (
 
 var _ = Describe("Basic test of greptimedb cluster in baremetal", Ordered, func() {
 	BeforeEach(func() {
-		ports := []int{4000, 4001, 4002, 4003}
-		for _, port := range ports {
-			err := checkAndClosePort(port)
-			Expect(err).NotTo(HaveOccurred(), fmt.Sprintf("failed to close port %d", port))
-		}
+		err := checkAndClosePort(4002)
+		Expect(err).NotTo(HaveOccurred(), fmt.Sprintf("failed to close port %d", 4002))
 	})
 	It("Bootstrap cluster in baremteal", func() {
 		var err error

From 28379a4b1640dbe8e31f7a5f6451e7c02b32a9e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 1 Jul 2024 14:18:52 +0800
Subject: [PATCH 086/108] fix

---
 tests/e2e/greptimedbcluster_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/greptimedbcluster_test.go b/tests/e2e/greptimedbcluster_test.go
index 07626f87..298caf6b 100644
--- a/tests/e2e/greptimedbcluster_test.go
+++ b/tests/e2e/greptimedbcluster_test.go
@@ -183,7 +183,7 @@ func deleteCluster() error {
 
 func forwardRequest() {
 	for {
-		cmd := exec.Command("kubectl", "port-forward", "svc/mydb-frontend", "4003:4003")
+		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

From f5d417eaad0dde2b2c159ac1f7f4ff2118409f6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 1 Jul 2024 14:34:26 +0800
Subject: [PATCH 087/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 1668b932..a3361108 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -34,7 +34,7 @@ import (
 var _ = Describe("Basic test of greptimedb cluster in baremetal", Ordered, func() {
 	BeforeEach(func() {
 		err := checkAndClosePort(4002)
-		Expect(err).NotTo(HaveOccurred(), fmt.Sprintf("failed to close port %d", 4002))
+		Expect(err).NotTo(HaveOccurred(), "failed to close port 4002")
 	})
 	It("Bootstrap cluster in baremteal", func() {
 		var err error

From 2879eb854292635c977ea77f404aa1dc4b1dcb47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 1 Jul 2024 14:52:32 +0800
Subject: [PATCH 088/108] closeport

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index a3361108..2f73892a 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -145,7 +145,9 @@ func checkPortInUse(port int) (bool, int, error) {
 // killProcess kills a process by its PID
 func killProcess(pid int) error {
 	cmd := exec.Command("kill", "-9", strconv.Itoa(pid))
-	return cmd.Run()
+	err := cmd.Run()
+	fmt.Println("the port 4002 is closed")
+	return err
 }
 
 // checkAndClosePort checks if a port is in use and closes it

From a9357c04f2fef29b3581e364ccc41101713e9300 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 1 Jul 2024 15:32:03 +0800
Subject: [PATCH 089/108] changeport

---
 tests/e2e/greptimedbcluster_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_test.go b/tests/e2e/greptimedbcluster_test.go
index 298caf6b..3f601abb 100644
--- a/tests/e2e/greptimedbcluster_test.go
+++ b/tests/e2e/greptimedbcluster_test.go
@@ -86,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:               "",
@@ -183,7 +183,7 @@ func deleteCluster() error {
 
 func forwardRequest() {
 	for {
-		cmd := exec.Command("kubectl", "port-forward", "svc/mydb-frontend", "4002:4002")
+		cmd := exec.Command("kubectl", "port-forward", "svc/mydb-frontend", "4005:4005")
 		if err := cmd.Run(); err != nil {
 			klog.Errorf("Failed to port forward: %v", err)
 			return

From 9dab097ace6011fdb02509e0f8f1951856db8975 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 1 Jul 2024 15:50:30 +0800
Subject: [PATCH 090/108] changeport

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 52 +++++++++----------
 tests/e2e/greptimedbcluster_test.go           |  4 +-
 2 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 2f73892a..79ae58c4 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -33,8 +33,10 @@ import (
 
 var _ = Describe("Basic test of greptimedb cluster in baremetal", Ordered, func() {
 	BeforeEach(func() {
+
 		err := checkAndClosePort(4002)
 		Expect(err).NotTo(HaveOccurred(), "failed to close port 4002")
+
 	})
 	It("Bootstrap cluster in baremteal", func() {
 		var err error
@@ -65,22 +67,18 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", Ordered, func(
 			fmt.Printf("Failed to copy log file content to stdout: %v\n", err)
 		}
 
-		if createcmd.Process != nil {
-			err = createcmd.Process.Kill()
-			Expect(err).NotTo(HaveOccurred(), "failed to kill create cluster process")
-		} else {
-			Fail("Process is not properly initialized")
-		}
+		err = createcmd.Process.Kill()
+		Expect(err).NotTo(HaveOccurred(), "failed to kill create cluster process")
 
 		err = createcmd.Wait()
 		if err != nil {
-			if exitErr, ok := err.(*exec.ExitError); ok {
-				GinkgoWriter.Printf("Process was killed with signal: %v,the process is terminated\n", exitErr)
+			if _, ok := err.(*exec.ExitError); ok {
+				fmt.Printf("the process is terminated\n")
 			} else {
-				GinkgoWriter.Printf("Process terminated with error: %v,failed to terminated the process\n", err)
+				fmt.Printf("Process terminated with error: %v,failed to terminated the process\n", err)
 			}
 		} else {
-			GinkgoWriter.Printf("failed to terminated the process\n")
+			fmt.Printf("failed to terminated the process\n")
 		}
 
 		err = deleteClusterinBaremetal()
@@ -115,6 +113,20 @@ func deleteClusterinBaremetal() error {
 	return nil
 }
 
+func checkAndClosePort(port int) error {
+	inUse, pid, err := checkPortInUse(port)
+	if err != nil {
+		return err
+	}
+
+	if inUse {
+		fmt.Printf("Port %d is in use by process %d, terminating process\n", port, pid)
+		return killProcess(pid)
+	}
+	fmt.Printf("Port %d is not in use\n", port)
+	return nil
+}
+
 func checkPortInUse(port int) (bool, int, error) {
 	cmd := exec.Command("lsof", "-i", fmt.Sprintf(":%d", port))
 	var out bytes.Buffer
@@ -142,25 +154,9 @@ func checkPortInUse(port int) (bool, int, error) {
 	return false, 0, nil
 }
 
-// killProcess kills a process by its PID
 func killProcess(pid int) error {
-	cmd := exec.Command("kill", "-9", strconv.Itoa(pid))
+	cmd := exec.Command("kill", strconv.Itoa(pid))
 	err := cmd.Run()
-	fmt.Println("the port 4002 is closed")
+	fmt.Println("the port is closed")
 	return err
 }
-
-// checkAndClosePort checks if a port is in use and closes it
-func checkAndClosePort(port int) error {
-	inUse, pid, err := checkPortInUse(port)
-	if err != nil {
-		return err
-	}
-
-	if inUse {
-		fmt.Printf("Port %d is in use by process %d, terminating process\n", port, pid)
-		return killProcess(pid)
-	}
-	fmt.Printf("Port %d is not in use\n", port)
-	return nil
-}
diff --git a/tests/e2e/greptimedbcluster_test.go b/tests/e2e/greptimedbcluster_test.go
index 3f601abb..298caf6b 100644
--- a/tests/e2e/greptimedbcluster_test.go
+++ b/tests/e2e/greptimedbcluster_test.go
@@ -86,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:4005",
+				Addr:                 "127.0.0.1:4002",
 				User:                 "",
 				Passwd:               "",
 				DBName:               "",
@@ -183,7 +183,7 @@ func deleteCluster() error {
 
 func forwardRequest() {
 	for {
-		cmd := exec.Command("kubectl", "port-forward", "svc/mydb-frontend", "4005:4005")
+		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

From 024566665840340fbe1b42768d0717eb8de82db8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 1 Jul 2024 16:04:52 +0800
Subject: [PATCH 091/108] test

---
 tests/e2e/greptimedbcluster_baremetal_test.go |  15 +-
 tests/e2e/greptimedbcluster_test.go           | 179 +++++++++---------
 2 files changed, 98 insertions(+), 96 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 79ae58c4..620662e4 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -17,14 +17,11 @@
 package e2e
 
 import (
-	"bytes"
 	"fmt"
 	"io"
 	"net"
 	"os"
 	"os/exec"
-	"strconv"
-	"strings"
 	"time"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -32,12 +29,14 @@ import (
 )
 
 var _ = Describe("Basic test of greptimedb cluster in baremetal", Ordered, func() {
-	BeforeEach(func() {
+	/*
+		BeforeEach(func() {
 
-		err := checkAndClosePort(4002)
-		Expect(err).NotTo(HaveOccurred(), "failed to close port 4002")
+			err := checkAndClosePort(4002)
+			Expect(err).NotTo(HaveOccurred(), "failed to close port 4002")
 
-	})
+		})
+	*/
 	It("Bootstrap cluster in baremteal", func() {
 		var err error
 		createcmd := newCreateClusterinBaremetalCommand()
@@ -113,6 +112,7 @@ func deleteClusterinBaremetal() error {
 	return nil
 }
 
+/*
 func checkAndClosePort(port int) error {
 	inUse, pid, err := checkPortInUse(port)
 	if err != nil {
@@ -160,3 +160,4 @@ func killProcess(pid int) error {
 	fmt.Println("the port is closed")
 	return err
 }
+*/
diff --git a/tests/e2e/greptimedbcluster_test.go b/tests/e2e/greptimedbcluster_test.go
index 298caf6b..37c91c69 100644
--- a/tests/e2e/greptimedbcluster_test.go
+++ b/tests/e2e/greptimedbcluster_test.go
@@ -17,52 +17,51 @@
 package e2e
 
 import (
-	"context"
-	"database/sql"
-	"fmt"
 	"os"
 	"os/exec"
-	"time"
 
-	"github.com/go-sql-driver/mysql"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-
-	"k8s.io/klog/v2"
 )
 
+/*
 const (
-	createTableSQL = `CREATE TABLE dist_table (
-                        ts TIMESTAMP DEFAULT current_timestamp(),
-                        n INT,
-    					row_id INT,
-                        TIME INDEX (ts),
-                        PRIMARY KEY(n)
-                     )
-                     PARTITION ON COLUMNS (n) (
-                        n < 5,
-                        n >= 5 AND n < 9,
-                        n >= 9
-					)`
-
-	insertDataSQLStr = "INSERT INTO dist_table(n, row_id) VALUES (%d, %d)"
-
-	selectDataSQL = `SELECT * FROM dist_table`
-
-	testRowIDNum = 10
+
+		createTableSQL = `CREATE TABLE dist_table (
+	                        ts TIMESTAMP DEFAULT current_timestamp(),
+	                        n INT,
+	    					row_id INT,
+	                        TIME INDEX (ts),
+	                        PRIMARY KEY(n)
+	                     )
+	                     PARTITION ON COLUMNS (n) (
+	                        n < 5,
+	                        n >= 5 AND n < 9,
+	                        n >= 9
+						)`
+
+		insertDataSQLStr = "INSERT INTO dist_table(n, row_id) VALUES (%d, %d)"
+
+		selectDataSQL = `SELECT * FROM dist_table`
+
+		testRowIDNum = 10
+
 )
 
 var (
+
 	defaultQueryTimeout = 5 * time.Second
+
 )
 
 // TestData is the schema of test data in SQL table.
-type TestData struct {
-	timestamp string
-	n         int32
-	rowID     int32
-}
 
+	type TestData struct {
+		timestamp string
+		n         int32
+		rowID     int32
+	}
+*/
 var _ = Describe("Basic test of greptimedb cluster", Ordered, func() {
 	It("Bootstrap cluster", func() {
 		var err error
@@ -74,68 +73,68 @@ var _ = Describe("Basic test of greptimedb cluster", Ordered, func() {
 
 		err = listCluster()
 		Expect(err).NotTo(HaveOccurred(), "failed to list cluster")
-
-		go func() {
-			forwardRequest()
-		}()
-
-		By("Connecting GreptimeDB")
-		var db *sql.DB
-		var conn *sql.Conn
-
-		Eventually(func() error {
-			cfg := mysql.Config{
-				Net:                  "tcp",
-				Addr:                 "127.0.0.1:4002",
-				User:                 "",
-				Passwd:               "",
-				DBName:               "",
-				AllowNativePasswords: true,
+		/*
+			go func() {
+				forwardRequest()
+			}()
+
+			By("Connecting GreptimeDB")
+			var db *sql.DB
+			var conn *sql.Conn
+
+			Eventually(func() error {
+				cfg := mysql.Config{
+					Net:                  "tcp",
+					Addr:                 "127.0.0.1:4002",
+					User:                 "",
+					Passwd:               "",
+					DBName:               "",
+					AllowNativePasswords: true,
+				}
+
+				db, err = sql.Open("mysql", cfg.FormatDSN())
+				if err != nil {
+					return err
+				}
+
+				conn, err = db.Conn(context.TODO())
+				if err != nil {
+					return err
+				}
+
+				return nil
+			}, 30*time.Second, time.Second).ShouldNot(HaveOccurred())
+
+			By("Execute SQL queries after connecting")
+
+			ctx, cancel := context.WithTimeout(context.Background(), defaultQueryTimeout)
+			defer cancel()
+
+			_, err = conn.ExecContext(ctx, createTableSQL)
+			Expect(err).NotTo(HaveOccurred(), "failed to create SQL table")
+
+			ctx, cancel = context.WithTimeout(context.Background(), defaultQueryTimeout)
+			defer cancel()
+			for rowID := 1; rowID <= testRowIDNum; rowID++ {
+				insertDataSQL := fmt.Sprintf(insertDataSQLStr, rowID, rowID)
+				_, err = conn.ExecContext(ctx, insertDataSQL)
+				Expect(err).NotTo(HaveOccurred(), "failed to insert data")
 			}
 
-			db, err = sql.Open("mysql", cfg.FormatDSN())
-			if err != nil {
-				return err
+			ctx, cancel = context.WithTimeout(context.Background(), defaultQueryTimeout)
+			defer cancel()
+			results, err := conn.QueryContext(ctx, selectDataSQL)
+			Expect(err).NotTo(HaveOccurred(), "failed to get data")
+
+			var data []TestData
+			for results.Next() {
+				var d TestData
+				err = results.Scan(&d.timestamp, &d.n, &d.rowID)
+				Expect(err).NotTo(HaveOccurred(), "failed to scan data that query from db")
+				data = append(data, d)
 			}
-
-			conn, err = db.Conn(context.TODO())
-			if err != nil {
-				return err
-			}
-
-			return nil
-		}, 30*time.Second, time.Second).ShouldNot(HaveOccurred())
-
-		By("Execute SQL queries after connecting")
-
-		ctx, cancel := context.WithTimeout(context.Background(), defaultQueryTimeout)
-		defer cancel()
-
-		_, err = conn.ExecContext(ctx, createTableSQL)
-		Expect(err).NotTo(HaveOccurred(), "failed to create SQL table")
-
-		ctx, cancel = context.WithTimeout(context.Background(), defaultQueryTimeout)
-		defer cancel()
-		for rowID := 1; rowID <= testRowIDNum; rowID++ {
-			insertDataSQL := fmt.Sprintf(insertDataSQLStr, rowID, rowID)
-			_, err = conn.ExecContext(ctx, insertDataSQL)
-			Expect(err).NotTo(HaveOccurred(), "failed to insert data")
-		}
-
-		ctx, cancel = context.WithTimeout(context.Background(), defaultQueryTimeout)
-		defer cancel()
-		results, err := conn.QueryContext(ctx, selectDataSQL)
-		Expect(err).NotTo(HaveOccurred(), "failed to get data")
-
-		var data []TestData
-		for results.Next() {
-			var d TestData
-			err = results.Scan(&d.timestamp, &d.n, &d.rowID)
-			Expect(err).NotTo(HaveOccurred(), "failed to scan data that query from db")
-			data = append(data, d)
-		}
-		Expect(len(data) == testRowIDNum).Should(BeTrue(), "get the wrong data from db")
-
+			Expect(len(data) == testRowIDNum).Should(BeTrue(), "get the wrong data from db")
+		*/
 		err = deleteCluster()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster")
 	})
@@ -181,6 +180,7 @@ func deleteCluster() error {
 	return nil
 }
 
+/*
 func forwardRequest() {
 	for {
 		cmd := exec.Command("kubectl", "port-forward", "svc/mydb-frontend", "4002:4002")
@@ -190,3 +190,4 @@ func forwardRequest() {
 		}
 	}
 }
+*/

From d2ef0e1ca0ef3491de62228ddaf4e680cd7a5122 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 1 Jul 2024 16:56:53 +0800
Subject: [PATCH 092/108] test

---
 tests/e2e/greptimedbcluster_test.go | 167 +++++++++++++++-------------
 1 file changed, 87 insertions(+), 80 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_test.go b/tests/e2e/greptimedbcluster_test.go
index 37c91c69..085e4bb2 100644
--- a/tests/e2e/greptimedbcluster_test.go
+++ b/tests/e2e/greptimedbcluster_test.go
@@ -17,17 +17,22 @@
 package e2e
 
 import (
+	"context"
+	"database/sql"
+	"fmt"
 	"os"
 	"os/exec"
+	"time"
 
+	"github.com/go-sql-driver/mysql"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
+	"k8s.io/klog/v2"
 )
 
-/*
 const (
-
-		createTableSQL = `CREATE TABLE dist_table (
+	createTableSQL = `CREATE TABLE dist_table (
 	                        ts TIMESTAMP DEFAULT current_timestamp(),
 	                        n INT,
 	    					row_id INT,
@@ -40,31 +45,29 @@ const (
 	                        n >= 9
 						)`
 
-		insertDataSQLStr = "INSERT INTO dist_table(n, row_id) VALUES (%d, %d)"
+	insertDataSQLStr = "INSERT INTO dist_table(n, row_id) VALUES (%d, %d)"
 
-		selectDataSQL = `SELECT * FROM dist_table`
-
-		testRowIDNum = 10
+	selectDataSQL = `SELECT * FROM dist_table`
 
+	testRowIDNum = 10
 )
 
 var (
-
 	defaultQueryTimeout = 5 * time.Second
-
 )
 
 // TestData is the schema of test data in SQL table.
 
-	type TestData struct {
-		timestamp string
-		n         int32
-		rowID     int32
-	}
-*/
+type TestData struct {
+	timestamp string
+	n         int32
+	rowID     int32
+}
+
 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")
 
@@ -73,70 +76,72 @@ var _ = Describe("Basic test of greptimedb cluster", Ordered, func() {
 
 		err = listCluster()
 		Expect(err).NotTo(HaveOccurred(), "failed to list cluster")
-		/*
-			go func() {
-				forwardRequest()
-			}()
-
-			By("Connecting GreptimeDB")
-			var db *sql.DB
-			var conn *sql.Conn
-
-			Eventually(func() error {
-				cfg := mysql.Config{
-					Net:                  "tcp",
-					Addr:                 "127.0.0.1:4002",
-					User:                 "",
-					Passwd:               "",
-					DBName:               "",
-					AllowNativePasswords: true,
-				}
-
-				db, err = sql.Open("mysql", cfg.FormatDSN())
-				if err != nil {
-					return err
-				}
-
-				conn, err = db.Conn(context.TODO())
-				if err != nil {
-					return err
-				}
-
-				return nil
-			}, 30*time.Second, time.Second).ShouldNot(HaveOccurred())
-
-			By("Execute SQL queries after connecting")
-
-			ctx, cancel := context.WithTimeout(context.Background(), defaultQueryTimeout)
-			defer cancel()
-
-			_, err = conn.ExecContext(ctx, createTableSQL)
-			Expect(err).NotTo(HaveOccurred(), "failed to create SQL table")
-
-			ctx, cancel = context.WithTimeout(context.Background(), defaultQueryTimeout)
-			defer cancel()
-			for rowID := 1; rowID <= testRowIDNum; rowID++ {
-				insertDataSQL := fmt.Sprintf(insertDataSQLStr, rowID, rowID)
-				_, err = conn.ExecContext(ctx, insertDataSQL)
-				Expect(err).NotTo(HaveOccurred(), "failed to insert data")
+
+		go func() {
+			forwardRequest(sig)
+		}()
+
+		By("Connecting GreptimeDB")
+		var db *sql.DB
+		var conn *sql.Conn
+
+		Eventually(func() error {
+			cfg := mysql.Config{
+				Net:                  "tcp",
+				Addr:                 "127.0.0.1:4002",
+				User:                 "",
+				Passwd:               "",
+				DBName:               "",
+				AllowNativePasswords: true,
+			}
+
+			db, err = sql.Open("mysql", cfg.FormatDSN())
+			if err != nil {
+				return err
 			}
 
-			ctx, cancel = context.WithTimeout(context.Background(), defaultQueryTimeout)
-			defer cancel()
-			results, err := conn.QueryContext(ctx, selectDataSQL)
-			Expect(err).NotTo(HaveOccurred(), "failed to get data")
-
-			var data []TestData
-			for results.Next() {
-				var d TestData
-				err = results.Scan(&d.timestamp, &d.n, &d.rowID)
-				Expect(err).NotTo(HaveOccurred(), "failed to scan data that query from db")
-				data = append(data, d)
+			conn, err = db.Conn(context.TODO())
+			if err != nil {
+				return err
 			}
-			Expect(len(data) == testRowIDNum).Should(BeTrue(), "get the wrong data from db")
-		*/
+
+			return nil
+		}, 30*time.Second, time.Second).ShouldNot(HaveOccurred())
+
+		By("Execute SQL queries after connecting")
+
+		ctx, cancel := context.WithTimeout(context.Background(), defaultQueryTimeout)
+		defer cancel()
+
+		_, err = conn.ExecContext(ctx, createTableSQL)
+		Expect(err).NotTo(HaveOccurred(), "failed to create SQL table")
+
+		ctx, cancel = context.WithTimeout(context.Background(), defaultQueryTimeout)
+		defer cancel()
+		for rowID := 1; rowID <= testRowIDNum; rowID++ {
+			insertDataSQL := fmt.Sprintf(insertDataSQLStr, rowID, rowID)
+			_, err = conn.ExecContext(ctx, insertDataSQL)
+			Expect(err).NotTo(HaveOccurred(), "failed to insert data")
+		}
+
+		ctx, cancel = context.WithTimeout(context.Background(), defaultQueryTimeout)
+		defer cancel()
+		results, err := conn.QueryContext(ctx, selectDataSQL)
+		Expect(err).NotTo(HaveOccurred(), "failed to get data")
+
+		var data []TestData
+		for results.Next() {
+			var d TestData
+			err = results.Scan(&d.timestamp, &d.n, &d.rowID)
+			Expect(err).NotTo(HaveOccurred(), "failed to scan data that query from db")
+			data = append(data, d)
+		}
+		Expect(len(data) == testRowIDNum).Should(BeTrue(), "get the wrong data from db")
+
 		err = deleteCluster()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster")
+
+		sig = false
 	})
 })
 
@@ -180,14 +185,16 @@ func deleteCluster() error {
 	return nil
 }
 
-/*
-func forwardRequest() {
+func forwardRequest(sig bool) {
 	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)
+		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 {
 			return
 		}
 	}
 }
-*/

From 95be0d78246c9e604732855503098a510c1114c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 1 Jul 2024 17:27:22 +0800
Subject: [PATCH 093/108] test

---
 tests/e2e/greptimedbcluster_test.go | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_test.go b/tests/e2e/greptimedbcluster_test.go
index 085e4bb2..9e78b4ad 100644
--- a/tests/e2e/greptimedbcluster_test.go
+++ b/tests/e2e/greptimedbcluster_test.go
@@ -27,8 +27,6 @@ import (
 	"github.com/go-sql-driver/mysql"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-
-	"k8s.io/klog/v2"
 )
 
 const (
@@ -67,7 +65,7 @@ type TestData struct {
 var _ = Describe("Basic test of greptimedb cluster", Ordered, func() {
 	It("Bootstrap cluster", func() {
 		var err error
-		sig := true
+		//		sig := true
 		err = createCluster()
 		Expect(err).NotTo(HaveOccurred(), "failed to create cluster")
 
@@ -76,11 +74,11 @@ var _ = Describe("Basic test of greptimedb cluster", Ordered, func() {
 
 		err = listCluster()
 		Expect(err).NotTo(HaveOccurred(), "failed to list cluster")
-
-		go func() {
-			forwardRequest(sig)
-		}()
-
+		/*
+			go func() {
+				forwardRequest(sig)
+			}()
+		*/
 		By("Connecting GreptimeDB")
 		var db *sql.DB
 		var conn *sql.Conn
@@ -141,7 +139,7 @@ var _ = Describe("Basic test of greptimedb cluster", Ordered, func() {
 		err = deleteCluster()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster")
 
-		sig = false
+		//		sig = false
 	})
 })
 
@@ -185,6 +183,7 @@ func deleteCluster() error {
 	return nil
 }
 
+/*
 func forwardRequest(sig bool) {
 	for {
 		if sig {
@@ -198,3 +197,4 @@ func forwardRequest(sig bool) {
 		}
 	}
 }
+*/

From c4a1b1b957007d92f91e6c8b44736e1eb28b7dd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 1 Jul 2024 18:28:26 +0800
Subject: [PATCH 094/108] test

---
 tests/e2e/greptimedbcluster_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_test.go b/tests/e2e/greptimedbcluster_test.go
index 9e78b4ad..31df8bde 100644
--- a/tests/e2e/greptimedbcluster_test.go
+++ b/tests/e2e/greptimedbcluster_test.go
@@ -86,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:               "",
@@ -187,7 +187,7 @@ func deleteCluster() error {
 func forwardRequest(sig bool) {
 	for {
 		if sig {
-			cmd := exec.Command("kubectl", "port-forward", "svc/mydb-frontend", "4002:4002")
+			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

From 0f6b62488c7e09280d8c0682087cf5ba3781f8eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Mon, 1 Jul 2024 18:48:55 +0800
Subject: [PATCH 095/108] test

---
 tests/e2e/greptimedbcluster_test.go | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_test.go b/tests/e2e/greptimedbcluster_test.go
index 31df8bde..c373249f 100644
--- a/tests/e2e/greptimedbcluster_test.go
+++ b/tests/e2e/greptimedbcluster_test.go
@@ -27,6 +27,7 @@ import (
 	"github.com/go-sql-driver/mysql"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	"k8s.io/klog/v2"
 )
 
 const (
@@ -65,7 +66,7 @@ type TestData struct {
 var _ = Describe("Basic test of greptimedb cluster", Ordered, func() {
 	It("Bootstrap cluster", func() {
 		var err error
-		//		sig := true
+		sig := true
 		err = createCluster()
 		Expect(err).NotTo(HaveOccurred(), "failed to create cluster")
 
@@ -74,11 +75,11 @@ var _ = Describe("Basic test of greptimedb cluster", Ordered, func() {
 
 		err = listCluster()
 		Expect(err).NotTo(HaveOccurred(), "failed to list cluster")
-		/*
-			go func() {
-				forwardRequest(sig)
-			}()
-		*/
+
+		go func() {
+			forwardRequest(&sig)
+		}()
+
 		By("Connecting GreptimeDB")
 		var db *sql.DB
 		var conn *sql.Conn
@@ -86,7 +87,7 @@ var _ = Describe("Basic test of greptimedb cluster", Ordered, func() {
 		Eventually(func() error {
 			cfg := mysql.Config{
 				Net:                  "tcp",
-				Addr:                 "127.0.0.1:4005",
+				Addr:                 "127.0.0.1:4002",
 				User:                 "",
 				Passwd:               "",
 				DBName:               "",
@@ -139,7 +140,7 @@ var _ = Describe("Basic test of greptimedb cluster", Ordered, func() {
 		err = deleteCluster()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster")
 
-		//		sig = false
+		sig = false
 	})
 })
 
@@ -183,11 +184,10 @@ func deleteCluster() error {
 	return nil
 }
 
-/*
-func forwardRequest(sig bool) {
+func forwardRequest(sig *bool) {
 	for {
-		if sig {
-			cmd := exec.Command("kubectl", "port-forward", "svc/mydb-frontend", "4002:4005")
+		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
@@ -197,4 +197,3 @@ func forwardRequest(sig bool) {
 		}
 	}
 }
-*/

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 096/108] 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
 		}
 	}

From ab43e0b6ced9b619b8e277a10a5c87ffa1856b43 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 15:23:55 +0800
Subject: [PATCH 097/108] baremetalport

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 698adf96..620662e4 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -26,7 +26,6 @@ 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() {
@@ -42,10 +41,6 @@ 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")
 
@@ -166,13 +161,3 @@ 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
-		}
-	}
-}

From d9e58a77d27311d801ffec7669307e5d275bcd92 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 16:19:45 +0800
Subject: [PATCH 098/108] baremetalport

---
 tests/e2e/greptimedbcluster_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_test.go b/tests/e2e/greptimedbcluster_test.go
index fa750248..3d6e3c80 100644
--- a/tests/e2e/greptimedbcluster_test.go
+++ b/tests/e2e/greptimedbcluster_test.go
@@ -86,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:4005",
+				Addr:                 "127.0.0.1:4002",
 				User:                 "",
 				Passwd:               "",
 				DBName:               "",
@@ -183,7 +183,7 @@ func deleteCluster() error {
 
 func forwardRequest() {
 	for {
-		cmd := exec.Command("kubectl", "port-forward", "svc/mydb-frontend", "4002:4005")
+		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

From 28138810569caa721980e93b5364206981f07521 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 17:55:02 +0800
Subject: [PATCH 099/108] mysqladress

---
 pkg/helm/testdata/db-manifests.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/helm/testdata/db-manifests.yaml b/pkg/helm/testdata/db-manifests.yaml
index 9792931d..cb30744c 100644
--- a/pkg/helm/testdata/db-manifests.yaml
+++ b/pkg/helm/testdata/db-manifests.yaml
@@ -49,7 +49,7 @@ spec:
       walDir: /data/greptimedb/wal
   httpServicePort: 4000
   grpcServicePort: 4001
-  mysqlServicePort: 4002
+  mysqlServicePort: 4004
   postgresServicePort: 4003
   initializer:
     image: 'registry.cn-hangzhou.aliyuncs.com/greptime/greptimedb-initializer:0.1.0-alpha.25'

From a994084cb0d622849a1e5cc722303562bedc1fde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 5 Jul 2024 15:31:20 +0800
Subject: [PATCH 100/108] sql

---
 pkg/helm/testdata/db-manifests.yaml           |   2 +-
 tests/e2e/greptimedbcluster_baremetal_test.go | 122 +++++++++---------
 2 files changed, 65 insertions(+), 59 deletions(-)

diff --git a/pkg/helm/testdata/db-manifests.yaml b/pkg/helm/testdata/db-manifests.yaml
index cb30744c..9792931d 100644
--- a/pkg/helm/testdata/db-manifests.yaml
+++ b/pkg/helm/testdata/db-manifests.yaml
@@ -49,7 +49,7 @@ spec:
       walDir: /data/greptimedb/wal
   httpServicePort: 4000
   grpcServicePort: 4001
-  mysqlServicePort: 4004
+  mysqlServicePort: 4002
   postgresServicePort: 4003
   initializer:
     image: 'registry.cn-hangzhou.aliyuncs.com/greptime/greptimedb-initializer:0.1.0-alpha.25'
diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 620662e4..549cead7 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -17,6 +17,8 @@
 package e2e
 
 import (
+	"context"
+	"database/sql"
 	"fmt"
 	"io"
 	"net"
@@ -24,19 +26,12 @@ import (
 	"os/exec"
 	"time"
 
+	"github.com/go-sql-driver/mysql"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
 var _ = Describe("Basic test of greptimedb cluster in baremetal", Ordered, func() {
-	/*
-		BeforeEach(func() {
-
-			err := checkAndClosePort(4002)
-			Expect(err).NotTo(HaveOccurred(), "failed to close port 4002")
-
-		})
-	*/
 	It("Bootstrap cluster in baremteal", func() {
 		var err error
 		createcmd := newCreateClusterinBaremetalCommand()
@@ -80,6 +75,67 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", Ordered, func(
 			fmt.Printf("failed to terminated the process\n")
 		}
 
+		go func() {
+			forwardRequest()
+		}()
+
+		By("Connecting GreptimeDB")
+		var db *sql.DB
+		var conn *sql.Conn
+
+		Eventually(func() error {
+			cfg := mysql.Config{
+				Net:                  "tcp",
+				Addr:                 "127.0.0.1:4002",
+				User:                 "",
+				Passwd:               "",
+				DBName:               "",
+				AllowNativePasswords: true,
+			}
+
+			db, err = sql.Open("mysql", cfg.FormatDSN())
+			if err != nil {
+				return err
+			}
+
+			conn, err = db.Conn(context.TODO())
+			if err != nil {
+				return err
+			}
+			defer conn.Close()
+			return nil
+		}, 30*time.Second, time.Second).ShouldNot(HaveOccurred())
+
+		By("Execute SQL queries after connecting")
+
+		ctx, cancel := context.WithTimeout(context.Background(), defaultQueryTimeout)
+		defer cancel()
+
+		_, err = conn.ExecContext(ctx, createTableSQL)
+		Expect(err).NotTo(HaveOccurred(), "failed to create SQL table")
+
+		ctx, cancel = context.WithTimeout(context.Background(), defaultQueryTimeout)
+		defer cancel()
+		for rowID := 1; rowID <= testRowIDNum; rowID++ {
+			insertDataSQL := fmt.Sprintf(insertDataSQLStr, rowID, rowID)
+			_, err = conn.ExecContext(ctx, insertDataSQL)
+			Expect(err).NotTo(HaveOccurred(), "failed to insert data")
+		}
+
+		ctx, cancel = context.WithTimeout(context.Background(), defaultQueryTimeout)
+		defer cancel()
+		results, err := conn.QueryContext(ctx, selectDataSQL)
+		Expect(err).NotTo(HaveOccurred(), "failed to get data")
+
+		var data []TestData
+		for results.Next() {
+			var d TestData
+			err = results.Scan(&d.timestamp, &d.n, &d.rowID)
+			Expect(err).NotTo(HaveOccurred(), "failed to scan data that query from db")
+			data = append(data, d)
+		}
+		Expect(len(data) == testRowIDNum).Should(BeTrue(), "get the wrong data from db")
+
 		err = deleteClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")
 	})
@@ -111,53 +167,3 @@ func deleteClusterinBaremetal() error {
 	}
 	return nil
 }
-
-/*
-func checkAndClosePort(port int) error {
-	inUse, pid, err := checkPortInUse(port)
-	if err != nil {
-		return err
-	}
-
-	if inUse {
-		fmt.Printf("Port %d is in use by process %d, terminating process\n", port, pid)
-		return killProcess(pid)
-	}
-	fmt.Printf("Port %d is not in use\n", port)
-	return nil
-}
-
-func checkPortInUse(port int) (bool, int, error) {
-	cmd := exec.Command("lsof", "-i", fmt.Sprintf(":%d", port))
-	var out bytes.Buffer
-	cmd.Stdout = &out
-	err := cmd.Run()
-	if err != nil {
-		return false, 0, err
-	}
-
-	if out.Len() == 0 {
-		return false, 0, nil
-	}
-
-	lines := strings.Split(out.String(), "\n")
-	if len(lines) > 1 {
-		fields := strings.Fields(lines[1])
-		if len(fields) > 1 {
-			pid, err := strconv.Atoi(fields[1])
-			if err != nil {
-				return false, 0, err
-			}
-			return true, pid, nil
-		}
-	}
-	return false, 0, nil
-}
-
-func killProcess(pid int) error {
-	cmd := exec.Command("kill", strconv.Itoa(pid))
-	err := cmd.Run()
-	fmt.Println("the port is closed")
-	return err
-}
-*/

From a7eca4baa86f54dcdc80b12adc0537cd7bb6ee96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 5 Jul 2024 15:36:04 +0800
Subject: [PATCH 101/108] sql

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 549cead7..b4a508ea 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -69,7 +69,7 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", Ordered, func(
 			if _, ok := err.(*exec.ExitError); ok {
 				fmt.Printf("the process is terminated\n")
 			} else {
-				fmt.Printf("Process terminated with error: %v,failed to terminated the process\n", err)
+				fmt.Printf("process terminated with error: %v,failed to terminated the process\n", err)
 			}
 		} else {
 			fmt.Printf("failed to terminated the process\n")

From a60de7e9cdd455bd6c93136085828b1667ab5e03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 5 Jul 2024 15:56:46 +0800
Subject: [PATCH 102/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index b4a508ea..e6c242f2 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -61,20 +61,6 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", Ordered, func(
 			fmt.Printf("Failed to copy log file content to stdout: %v\n", err)
 		}
 
-		err = createcmd.Process.Kill()
-		Expect(err).NotTo(HaveOccurred(), "failed to kill create cluster process")
-
-		err = createcmd.Wait()
-		if err != nil {
-			if _, ok := err.(*exec.ExitError); ok {
-				fmt.Printf("the process is terminated\n")
-			} else {
-				fmt.Printf("process terminated with error: %v,failed to terminated the process\n", err)
-			}
-		} else {
-			fmt.Printf("failed to terminated the process\n")
-		}
-
 		go func() {
 			forwardRequest()
 		}()
@@ -136,6 +122,20 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", Ordered, func(
 		}
 		Expect(len(data) == testRowIDNum).Should(BeTrue(), "get the wrong data from db")
 
+		err = createcmd.Process.Kill()
+		Expect(err).NotTo(HaveOccurred(), "failed to kill create cluster process")
+
+		err = createcmd.Wait()
+		if err != nil {
+			if _, ok := err.(*exec.ExitError); ok {
+				fmt.Printf("the process is terminated\n")
+			} else {
+				fmt.Printf("process terminated with error: %v,failed to terminated the process\n", err)
+			}
+		} else {
+			fmt.Printf("failed to terminated the process\n")
+		}
+
 		err = deleteClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster in baremetal")
 	})

From dc4c4066ca6df466532759e0e670a64fa880c1c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 5 Jul 2024 16:48:23 +0800
Subject: [PATCH 103/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index e6c242f2..de126d75 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -20,7 +20,6 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-	"io"
 	"net"
 	"os"
 	"os/exec"
@@ -49,18 +48,18 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", Ordered, func(
 		err = getClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
 
-		logFile, err := os.Open("/home/runner/.gtctl/mycluster/logs/frontend.0/log")
-		if err != nil {
-			fmt.Printf("Failed to open log file: %v\n", err)
-			return
-		}
-		defer logFile.Close()
-
-		// 将文件内容拷贝到标准输出
-		if _, err := io.Copy(os.Stdout, logFile); err != nil {
-			fmt.Printf("Failed to copy log file content to stdout: %v\n", err)
-		}
-
+		/*		logFile, err := os.Open("/home/runner/.gtctl/mycluster/logs/frontend.0/log")
+				if err != nil {
+					fmt.Printf("Failed to open log file: %v\n", err)
+					return
+				}
+				defer logFile.Close()
+
+				// 将文件内容拷贝到标准输出
+				if _, err := io.Copy(os.Stdout, logFile); err != nil {
+					fmt.Printf("Failed to copy log file content to stdout: %v\n", err)
+				}
+		*/
 		go func() {
 			forwardRequest()
 		}()

From 5a56011cc8daa5677230e5bd7bd1477ffcf7fc1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 5 Jul 2024 16:57:58 +0800
Subject: [PATCH 104/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index de126d75..acbd9c08 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -87,7 +87,7 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", Ordered, func(
 			if err != nil {
 				return err
 			}
-			defer conn.Close()
+			//		defer conn.Close()
 			return nil
 		}, 30*time.Second, time.Second).ShouldNot(HaveOccurred())
 

From d4f0dd50254ac22194afd5858c9c44dab79b16aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 5 Jul 2024 17:12:36 +0800
Subject: [PATCH 105/108] fix

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index acbd9c08..3cfe65af 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -20,6 +20,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"io"
 	"net"
 	"os"
 	"os/exec"
@@ -48,18 +49,18 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", Ordered, func(
 		err = getClusterinBaremetal()
 		Expect(err).NotTo(HaveOccurred(), "failed to get cluster in baremetal")
 
-		/*		logFile, err := os.Open("/home/runner/.gtctl/mycluster/logs/frontend.0/log")
-				if err != nil {
-					fmt.Printf("Failed to open log file: %v\n", err)
-					return
-				}
-				defer logFile.Close()
-
-				// 将文件内容拷贝到标准输出
-				if _, err := io.Copy(os.Stdout, logFile); err != nil {
-					fmt.Printf("Failed to copy log file content to stdout: %v\n", err)
-				}
-		*/
+		logFile, err := os.Open("/home/runner/.gtctl/mycluster/logs/frontend.0/log")
+		if err != nil {
+			fmt.Printf("Failed to open log file: %v\n", err)
+			return
+		}
+		defer logFile.Close()
+
+		// 将文件内容拷贝到标准输出
+		if _, err := io.Copy(os.Stdout, logFile); err != nil {
+			fmt.Printf("Failed to copy log file content to stdout: %v\n", err)
+		}
+
 		go func() {
 			forwardRequest()
 		}()
@@ -87,7 +88,6 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", Ordered, func(
 			if err != nil {
 				return err
 			}
-			//		defer conn.Close()
 			return nil
 		}, 30*time.Second, time.Second).ShouldNot(HaveOccurred())
 

From a4f2fc095dfb3b35657cd39de6773a55ab7a476f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=B6=A6=E6=A2=93?= <528185299@qq.com>
Date: Fri, 5 Jul 2024 17:26:26 +0800
Subject: [PATCH 106/108] close

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 3 +++
 tests/e2e/greptimedbcluster_test.go           | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index 3cfe65af..e2919e6a 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -121,6 +121,9 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", Ordered, func(
 		}
 		Expect(len(data) == testRowIDNum).Should(BeTrue(), "get the wrong data from db")
 
+		err = conn.Close()
+		Expect(err).NotTo(HaveOccurred(), "failed to close SQL connection")
+
 		err = createcmd.Process.Kill()
 		Expect(err).NotTo(HaveOccurred(), "failed to kill create cluster process")
 
diff --git a/tests/e2e/greptimedbcluster_test.go b/tests/e2e/greptimedbcluster_test.go
index 3d6e3c80..76b799c9 100644
--- a/tests/e2e/greptimedbcluster_test.go
+++ b/tests/e2e/greptimedbcluster_test.go
@@ -102,7 +102,6 @@ var _ = Describe("Basic test of greptimedb cluster", Ordered, func() {
 			if err != nil {
 				return err
 			}
-
 			return nil
 		}, 30*time.Second, time.Second).ShouldNot(HaveOccurred())
 
@@ -136,6 +135,9 @@ var _ = Describe("Basic test of greptimedb cluster", Ordered, func() {
 		}
 		Expect(len(data) == testRowIDNum).Should(BeTrue(), "get the wrong data from db")
 
+		err = conn.Close()
+		Expect(err).NotTo(HaveOccurred(), "failed to close SQL connection")
+
 		err = deleteCluster()
 		Expect(err).NotTo(HaveOccurred(), "failed to delete cluster")
 	})

From 33f15b5dd6ca582bd4da5b0ed48eecf872cfe984 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, 9 Jul 2024 11:32:45 +0800
Subject: [PATCH 107/108] sql

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index e2919e6a..c59be3d8 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -95,12 +95,6 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", Ordered, func(
 
 		ctx, cancel := context.WithTimeout(context.Background(), defaultQueryTimeout)
 		defer cancel()
-
-		_, err = conn.ExecContext(ctx, createTableSQL)
-		Expect(err).NotTo(HaveOccurred(), "failed to create SQL table")
-
-		ctx, cancel = context.WithTimeout(context.Background(), defaultQueryTimeout)
-		defer cancel()
 		for rowID := 1; rowID <= testRowIDNum; rowID++ {
 			insertDataSQL := fmt.Sprintf(insertDataSQLStr, rowID, rowID)
 			_, err = conn.ExecContext(ctx, insertDataSQL)

From 3ab89fbbf30be5d6f7997712f1dde502cc050015 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, 9 Jul 2024 11:37:27 +0800
Subject: [PATCH 108/108] sql

---
 tests/e2e/greptimedbcluster_baremetal_test.go | 60 -------------------
 1 file changed, 60 deletions(-)

diff --git a/tests/e2e/greptimedbcluster_baremetal_test.go b/tests/e2e/greptimedbcluster_baremetal_test.go
index c59be3d8..a36ed3ae 100644
--- a/tests/e2e/greptimedbcluster_baremetal_test.go
+++ b/tests/e2e/greptimedbcluster_baremetal_test.go
@@ -17,8 +17,6 @@
 package e2e
 
 import (
-	"context"
-	"database/sql"
 	"fmt"
 	"io"
 	"net"
@@ -26,7 +24,6 @@ import (
 	"os/exec"
 	"time"
 
-	"github.com/go-sql-driver/mysql"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
@@ -61,63 +58,6 @@ var _ = Describe("Basic test of greptimedb cluster in baremetal", Ordered, func(
 			fmt.Printf("Failed to copy log file content to stdout: %v\n", err)
 		}
 
-		go func() {
-			forwardRequest()
-		}()
-
-		By("Connecting GreptimeDB")
-		var db *sql.DB
-		var conn *sql.Conn
-
-		Eventually(func() error {
-			cfg := mysql.Config{
-				Net:                  "tcp",
-				Addr:                 "127.0.0.1:4002",
-				User:                 "",
-				Passwd:               "",
-				DBName:               "",
-				AllowNativePasswords: true,
-			}
-
-			db, err = sql.Open("mysql", cfg.FormatDSN())
-			if err != nil {
-				return err
-			}
-
-			conn, err = db.Conn(context.TODO())
-			if err != nil {
-				return err
-			}
-			return nil
-		}, 30*time.Second, time.Second).ShouldNot(HaveOccurred())
-
-		By("Execute SQL queries after connecting")
-
-		ctx, cancel := context.WithTimeout(context.Background(), defaultQueryTimeout)
-		defer cancel()
-		for rowID := 1; rowID <= testRowIDNum; rowID++ {
-			insertDataSQL := fmt.Sprintf(insertDataSQLStr, rowID, rowID)
-			_, err = conn.ExecContext(ctx, insertDataSQL)
-			Expect(err).NotTo(HaveOccurred(), "failed to insert data")
-		}
-
-		ctx, cancel = context.WithTimeout(context.Background(), defaultQueryTimeout)
-		defer cancel()
-		results, err := conn.QueryContext(ctx, selectDataSQL)
-		Expect(err).NotTo(HaveOccurred(), "failed to get data")
-
-		var data []TestData
-		for results.Next() {
-			var d TestData
-			err = results.Scan(&d.timestamp, &d.n, &d.rowID)
-			Expect(err).NotTo(HaveOccurred(), "failed to scan data that query from db")
-			data = append(data, d)
-		}
-		Expect(len(data) == testRowIDNum).Should(BeTrue(), "get the wrong data from db")
-
-		err = conn.Close()
-		Expect(err).NotTo(HaveOccurred(), "failed to close SQL connection")
-
 		err = createcmd.Process.Kill()
 		Expect(err).NotTo(HaveOccurred(), "failed to kill create cluster process")