Skip to content

Commit 2d8c002

Browse files
BruceAkoBruceAko
committed
fix: add test
Signed-off-by: BruceAko <chongzhi@hust.edu.cn>
1 parent 907c571 commit 2d8c002

File tree

3 files changed

+82
-84
lines changed

3 files changed

+82
-84
lines changed

‎test/e2e/v2/containerd_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ var _ = Describe("Containerd with CRI support", func() {
6060
},
6161
}
6262

63-
clientPod, err := util.AllClientsExec()
63+
clientPods, err := util.AllClientsExec()
6464
fmt.Println(err)
6565
Expect(err).NotTo(HaveOccurred())
6666
for _, taskMetadata := range taskMetadatas {
67-
sha256sum, err := util.CalculateSha256ByTaskID(clientPod, taskMetadata.ID)
67+
sha256sum, err := util.CalculateSha256ByTaskID(clientPods, taskMetadata.ID)
6868
Expect(err).NotTo(HaveOccurred())
6969
Expect(taskMetadata.Sha256).To(Equal(sha256sum))
7070
}
@@ -115,12 +115,12 @@ var _ = Describe("Containerd with CRI support", func() {
115115
},
116116
}
117117

118-
clientPod, err := util.AllClientsExec()
118+
clientPods, err := util.AllClientsExec()
119119
fmt.Println(err)
120120
Expect(err).NotTo(HaveOccurred())
121121

122122
for _, taskMetadata := range taskMetadatas {
123-
sha256sum, err := util.CalculateSha256ByTaskID(clientPod, taskMetadata.ID)
123+
sha256sum, err := util.CalculateSha256ByTaskID(clientPods, taskMetadata.ID)
124124
Expect(err).NotTo(HaveOccurred())
125125
Expect(taskMetadata.Sha256).To(Equal(sha256sum))
126126
}
@@ -179,12 +179,12 @@ var _ = Describe("Containerd with CRI support", func() {
179179
},
180180
}
181181

182-
clientPod, err := util.AllClientsExec()
182+
clientPods, err := util.AllClientsExec()
183183
fmt.Println(err)
184184
Expect(err).NotTo(HaveOccurred())
185185

186186
for _, taskMetadata := range taskMetadatas {
187-
sha256sum, err := util.CalculateSha256ByTaskID(clientPod, taskMetadata.ID)
187+
sha256sum, err := util.CalculateSha256ByTaskID(clientPods, taskMetadata.ID)
188188
Expect(err).NotTo(HaveOccurred())
189189
Expect(taskMetadata.Sha256).To(Equal(sha256sum))
190190
}
@@ -231,12 +231,12 @@ var _ = Describe("Containerd with CRI support", func() {
231231
},
232232
}
233233

234-
clientPod, err := util.AllClientsExec()
234+
clientPods, err := util.AllClientsExec()
235235
fmt.Println(err)
236236
Expect(err).NotTo(HaveOccurred())
237237

238238
for _, taskMetadata := range taskMetadatas {
239-
sha256sum, err := util.CalculateSha256ByTaskID(clientPod, taskMetadata.ID)
239+
sha256sum, err := util.CalculateSha256ByTaskID(clientPods, taskMetadata.ID)
240240
Expect(err).NotTo(HaveOccurred())
241241
Expect(taskMetadata.Sha256).To(Equal(sha256sum))
242242
}

‎test/e2e/v2/leave_host_test.go‎

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -16,77 +16,77 @@
1616

1717
package e2e
1818

19-
//import (
20-
// "context"
21-
// "fmt"
22-
// "strings"
23-
// "time"
24-
//
25-
// . "github.com/onsi/ginkgo/v2" //nolint
26-
// . "github.com/onsi/gomega" //nolint
27-
// "google.golang.org/grpc"
28-
// "google.golang.org/grpc/credentials/insecure"
29-
//
30-
// schedulerclient "d7y.io/dragonfly/v2/pkg/rpc/scheduler/client"
31-
// "d7y.io/dragonfly/v2/test/e2e/v2/util"
32-
//)
33-
//
34-
//var _ = Describe("Clients Leaving", func() {
35-
// Context("normally", func() {
36-
// It("number of hosts should be ok", Label("host", "leave"), func() {
37-
// grpcCredentials := insecure.NewCredentials()
38-
// schedulerClient, err := schedulerclient.GetV2ByAddr(context.Background(), ":8002", grpc.WithTransportCredentials(grpcCredentials))
39-
// Expect(err).NotTo(HaveOccurred())
40-
//
41-
// time.Sleep(3 * time.Minute)
42-
// hostCount := util.Servers[util.SeedClientServerName].Replicas + util.Servers[util.ClientServerName].Replicas
43-
// Expect(getHostCountFromScheduler(schedulerClient)).To(Equal(hostCount))
44-
//
45-
// podName, err := util.GetClientPodName(0)
46-
// Expect(err).NotTo(HaveOccurred())
47-
//
48-
// out, err := util.KubeCtlCommand("-n", util.DragonflyNamespace, "delete", "pod", podName).CombinedOutput()
49-
// fmt.Println(string(out))
50-
// Expect(err).NotTo(HaveOccurred())
51-
// time.Sleep(1 * time.Minute)
52-
// Expect(getHostCountFromScheduler(schedulerClient)).To(Equal(hostCount))
53-
// })
54-
// })
55-
//
56-
// Context("abnormally", func() {
57-
// It("number of hosts should be ok", Label("host", "leave"), func() {
58-
// grpcCredentials := insecure.NewCredentials()
59-
// schedulerClient, err := schedulerclient.GetV2ByAddr(context.Background(), ":8002", grpc.WithTransportCredentials(grpcCredentials))
60-
// Expect(err).NotTo(HaveOccurred())
61-
//
62-
// time.Sleep(4 * time.Minute)
63-
// hostCount := util.Servers[util.SeedClientServerName].Replicas + util.Servers[util.ClientServerName].Replicas
64-
// Expect(getHostCountFromScheduler(schedulerClient)).To(Equal(hostCount))
65-
//
66-
// podName, err := util.GetClientPodName(0)
67-
// Expect(err).NotTo(HaveOccurred())
68-
//
69-
// out, err := util.KubeCtlCommand("-n", util.DragonflyNamespace, "delete", "pod", podName, "--force", "--grace-period=0").CombinedOutput()
70-
// fmt.Println(string(out))
71-
// Expect(err).NotTo(HaveOccurred())
72-
// time.Sleep(6 * time.Minute)
73-
// Expect(getHostCountFromScheduler(schedulerClient)).To(Equal(hostCount))
74-
// })
75-
// })
76-
//})
77-
//
78-
//func getHostCountFromScheduler(schedulerClient schedulerclient.V2) (hostCount int) {
79-
// response, err := schedulerClient.ListHosts(context.Background(), "")
80-
// fmt.Println(response, err)
81-
// Expect(err).NotTo(HaveOccurred())
82-
//
83-
// hosts := response.Hosts
84-
// for _, host := range hosts {
85-
// // HostID: "10.244.0.13-dragonfly-seed-client-0-seed"
86-
// // PeerHostID: "3dba4916d8271d6b71bb20e95a0b5494c9a941ab7ef3567f805abca8614dc128"
87-
// if strings.Contains(host.Id, "-") {
88-
// hostCount++
89-
// }
90-
// }
91-
// return
92-
//}
19+
import (
20+
"context"
21+
"fmt"
22+
"strings"
23+
"time"
24+
25+
. "github.com/onsi/ginkgo/v2" //nolint
26+
. "github.com/onsi/gomega" //nolint
27+
"google.golang.org/grpc"
28+
"google.golang.org/grpc/credentials/insecure"
29+
30+
schedulerclient "d7y.io/dragonfly/v2/pkg/rpc/scheduler/client"
31+
"d7y.io/dragonfly/v2/test/e2e/v2/util"
32+
)
33+
34+
var _ = Describe("Clients Leaving", func() {
35+
Context("normally", func() {
36+
It("number of hosts should be ok", Label("host", "leave"), func() {
37+
grpcCredentials := insecure.NewCredentials()
38+
schedulerClient, err := schedulerclient.GetV2ByAddr(context.Background(), ":8002", grpc.WithTransportCredentials(grpcCredentials))
39+
Expect(err).NotTo(HaveOccurred())
40+
41+
time.Sleep(3 * time.Minute)
42+
hostCount := util.Servers[util.SeedClientServerName].Replicas + util.Servers[util.ClientServerName].Replicas
43+
Expect(getHostCountFromScheduler(schedulerClient)).To(Equal(hostCount))
44+
45+
podName, err := util.GetClientPodName(1)
46+
Expect(err).NotTo(HaveOccurred())
47+
48+
out, err := util.KubeCtlCommand("-n", util.DragonflyNamespace, "delete", "pod", podName).CombinedOutput()
49+
fmt.Println(string(out))
50+
Expect(err).NotTo(HaveOccurred())
51+
time.Sleep(1 * time.Minute)
52+
Expect(getHostCountFromScheduler(schedulerClient)).To(Equal(hostCount))
53+
})
54+
})
55+
56+
Context("abnormally", func() {
57+
It("number of hosts should be ok", Label("host", "leave"), func() {
58+
grpcCredentials := insecure.NewCredentials()
59+
schedulerClient, err := schedulerclient.GetV2ByAddr(context.Background(), ":8002", grpc.WithTransportCredentials(grpcCredentials))
60+
Expect(err).NotTo(HaveOccurred())
61+
62+
time.Sleep(4 * time.Minute)
63+
hostCount := util.Servers[util.SeedClientServerName].Replicas + util.Servers[util.ClientServerName].Replicas
64+
Expect(getHostCountFromScheduler(schedulerClient)).To(Equal(hostCount))
65+
66+
podName, err := util.GetClientPodName(1)
67+
Expect(err).NotTo(HaveOccurred())
68+
69+
out, err := util.KubeCtlCommand("-n", util.DragonflyNamespace, "delete", "pod", podName, "--force", "--grace-period=0").CombinedOutput()
70+
fmt.Println(string(out))
71+
Expect(err).NotTo(HaveOccurred())
72+
time.Sleep(6 * time.Minute)
73+
Expect(getHostCountFromScheduler(schedulerClient)).To(Equal(hostCount))
74+
})
75+
})
76+
})
77+
78+
func getHostCountFromScheduler(schedulerClient schedulerclient.V2) (hostCount int) {
79+
response, err := schedulerClient.ListHosts(context.Background(), "")
80+
fmt.Println(response, err)
81+
Expect(err).NotTo(HaveOccurred())
82+
83+
hosts := response.Hosts
84+
for _, host := range hosts {
85+
// HostID: "10.244.0.13-dragonfly-seed-client-0-seed"
86+
// PeerHostID: "3dba4916d8271d6b71bb20e95a0b5494c9a941ab7ef3567f805abca8614dc128"
87+
if strings.Contains(host.Id, "-") {
88+
hostCount++
89+
}
90+
}
91+
return
92+
}

‎test/e2e/v2/util/task.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ func CheckFilesExist(pods []*PodExec, taskID string) bool {
4848
func CalculateSha256ByTaskID(pods []*PodExec, taskID string) (string, error) {
4949
var sha256sum string
5050
for _, pod := range pods {
51-
res, _ := pod.Command("ls", clientContentDir).CombinedOutput()
52-
fmt.Println(string(res))
5351
contentPath := fmt.Sprintf("%s/%s", clientContentDir, taskID)
5452
if _, err := pod.Command("ls", contentPath).CombinedOutput(); err != nil {
5553
// If the path does not exist, skip this client.

0 commit comments

Comments
 (0)