Skip to content

Commit

Permalink
foeward
Browse files Browse the repository at this point in the history
  • Loading branch information
庄润梓 committed Jul 2, 2024
1 parent 0f6b624 commit 63f9f69
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 13 deletions.
15 changes: 15 additions & 0 deletions tests/e2e/greptimedbcluster_baremetal_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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")

Expand Down Expand Up @@ -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
}
}
}
19 changes: 6 additions & 13 deletions tests/e2e/greptimedbcluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand All @@ -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")
Expand All @@ -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: "",
Expand Down Expand Up @@ -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
})
})

Expand Down Expand Up @@ -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
}
}
Expand Down

0 comments on commit 63f9f69

Please sign in to comment.