Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update image versions to v2.2.1-rc.3 in compatibility e2e test #3882

Merged
merged 1 commit into from
Mar 12, 2025
Merged

chore: update image versions to v2.2.1-rc.3 in compatibility e2e test #3882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/compatibility-e2e-v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ jobs:
include:
- module: manager
image: manager
image-tag: v2.2.1-rc.2
image-tag: v2.2.1-rc.3
chart-name: manager
skip: "Rate Limit"
- module: scheduler
image: scheduler
image-tag: v2.2.1-rc.2
image-tag: v2.2.1-rc.3
chart-name: scheduler
skip: "Rate Limit"
- module: client
Expand Down
10 changes: 0 additions & 10 deletions scheduler/resource/standard/host_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (

"d7y.io/dragonfly/v2/pkg/container/set"
pkggc "d7y.io/dragonfly/v2/pkg/gc"
"d7y.io/dragonfly/v2/pkg/types"
"d7y.io/dragonfly/v2/scheduler/config"
)

Expand Down Expand Up @@ -185,15 +184,6 @@ func (h *hostManager) RunGC() error {
return true
}

// Reclaim the host.
if host.PeerCount.Load() == 0 &&
host.ConcurrentUploadCount.Load() == 0 &&
host.Type == types.HostTypeNormal {
host.Log.Info("host has been reclaimed")
h.Delete(host.ID)
return true
}

return true
})

Expand Down
15 changes: 0 additions & 15 deletions scheduler/resource/standard/host_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,21 +433,6 @@ func TestHostManager_RunGC(t *testing.T) {
mock func(m *gc.MockGCMockRecorder)
expect func(t *testing.T, hostManager HostManager, mockHost *Host, mockPeer *Peer)
}{
{
name: "host reclaimed",
mock: func(m *gc.MockGCMockRecorder) {
m.Add(gomock.Any()).Return(nil).Times(1)
},
expect: func(t *testing.T, hostManager HostManager, mockHost *Host, mockPeer *Peer) {
assert := assert.New(t)
hostManager.Store(mockHost)
err := hostManager.RunGC()
assert.NoError(err)

_, loaded := hostManager.Load(mockHost.ID)
assert.Equal(loaded, false)
},
},
{
name: "host has peers",
mock: func(m *gc.MockGCMockRecorder) {
Expand Down
10 changes: 5 additions & 5 deletions test/e2e/v2/dfcache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ var _ = Describe("Import and Export Using Dfcache", func() {
Expect(err).NotTo(HaveOccurred())
Expect(testFile.GetSha256()).To(Equal(sha256sum))

importOut, err := clientPod.Command("sh", "-c", fmt.Sprintf("dfcache import %s --id %s", testFile.GetOutputPath(), testFile.GetSha256())).CombinedOutput()
importOut, err := clientPod.Command("sh", "-c", fmt.Sprintf("dfcache import %s --persistent-replica-count 1 --id %s", testFile.GetOutputPath(), testFile.GetSha256())).CombinedOutput()
fmt.Println(string(importOut), err)
Expect(err).NotTo(HaveOccurred())

Expand Down Expand Up @@ -116,7 +116,7 @@ var _ = Describe("Import and Export Using Dfcache", func() {
Expect(err).NotTo(HaveOccurred())
Expect(testFile.GetSha256()).To(Equal(sha256sum))

importOut, err := clientPod.Command("sh", "-c", fmt.Sprintf("dfcache import %s --id %s", testFile.GetOutputPath(), testFile.GetSha256())).CombinedOutput()
importOut, err := clientPod.Command("sh", "-c", fmt.Sprintf("dfcache import %s --persistent-replica-count 1 --id %s", testFile.GetOutputPath(), testFile.GetSha256())).CombinedOutput()
fmt.Println(string(importOut), err)
Expect(err).NotTo(HaveOccurred())

Expand Down Expand Up @@ -172,7 +172,7 @@ var _ = Describe("Import and Export Using Dfcache", func() {
Expect(err).NotTo(HaveOccurred())
Expect(testFile.GetSha256()).To(Equal(sha256sum))

importOut, err := clientPod.Command("sh", "-c", fmt.Sprintf("dfcache import %s --id %s", testFile.GetOutputPath(), testFile.GetSha256())).CombinedOutput()
importOut, err := clientPod.Command("sh", "-c", fmt.Sprintf("dfcache import %s --persistent-replica-count 1 --id %s", testFile.GetOutputPath(), testFile.GetSha256())).CombinedOutput()
fmt.Println(string(importOut), err)
Expect(err).NotTo(HaveOccurred())

Expand Down Expand Up @@ -228,7 +228,7 @@ var _ = Describe("Import and Export Using Dfcache", func() {
Expect(err).NotTo(HaveOccurred())
Expect(testFile.GetSha256()).To(Equal(sha256sum))

importOut, err := clientPod.Command("sh", "-c", fmt.Sprintf("dfcache import %s --id %s", testFile.GetOutputPath(), testFile.GetSha256())).CombinedOutput()
importOut, err := clientPod.Command("sh", "-c", fmt.Sprintf("dfcache import %s --persistent-replica-count 1 --id %s", testFile.GetOutputPath(), testFile.GetSha256())).CombinedOutput()
fmt.Println(string(importOut), err)
Expect(err).NotTo(HaveOccurred())

Expand Down Expand Up @@ -284,7 +284,7 @@ var _ = Describe("Import and Export Using Dfcache", func() {
Expect(err).NotTo(HaveOccurred())
Expect(testFile.GetSha256()).To(Equal(sha256sum))

importOut, err := clientPod.Command("sh", "-c", fmt.Sprintf("dfcache import %s --id %s", testFile.GetOutputPath(), testFile.GetSha256())).CombinedOutput()
importOut, err := clientPod.Command("sh", "-c", fmt.Sprintf("dfcache import %s --persistent-replica-count 1 --id %s", testFile.GetOutputPath(), testFile.GetSha256())).CombinedOutput()
fmt.Println(string(importOut), err)
Expect(err).NotTo(HaveOccurred())

Expand Down
6 changes: 3 additions & 3 deletions test/testdata/charts/config-v2-rate-limit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ scheduler:
verbose: true
scheduler:
algorithm: default
retryBackToSourceLimit: 5
retryLimit: 7
retryInterval: 500ms
retryBackToSourceLimit: 7
retryLimit: 10
retryInterval: 800ms
gc:
hostGCInterval: 2m

Expand Down
6 changes: 3 additions & 3 deletions test/testdata/charts/config-v2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ scheduler:
verbose: true
scheduler:
algorithm: default
retryBackToSourceLimit: 5
retryLimit: 7
retryInterval: 500ms
retryBackToSourceLimit: 7
retryLimit: 10
retryInterval: 800ms
gc:
hostGCInterval: 2m

Expand Down
Loading