Skip to content

Commit 1746400

Browse files
committed
test: remove EFC metadata test seam
Signed-off-by: Harsh <harshmastic@gmail.com>
1 parent 23eadf5 commit 1746400

2 files changed

Lines changed: 3 additions & 109 deletions

File tree

pkg/ddc/efc/metadata.go

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,8 @@ import (
2525
"k8s.io/client-go/util/retry"
2626
)
2727

28-
var (
29-
shouldCheckUFS = func(e *EFCEngine) (bool, error) {
30-
return e.ShouldCheckUFS()
31-
}
32-
totalStorageBytes = func(e *EFCEngine) (int64, error) {
33-
return e.TotalStorageBytes()
34-
}
35-
totalFileNums = func(e *EFCEngine) (int64, error) {
36-
return e.TotalFileNums()
37-
}
38-
)
39-
4028
func (e *EFCEngine) SyncMetadata() (err error) {
41-
should, err := shouldCheckUFS(e)
29+
should, err := e.ShouldCheckUFS()
4230
if err != nil {
4331
e.Log.Error(err, "Failed to check if should sync metadata")
4432
return
@@ -50,14 +38,14 @@ func (e *EFCEngine) SyncMetadata() (err error) {
5038
}
5139

5240
func (e *EFCEngine) syncMetadataInternal() (err error) {
53-
datasetUFSTotalBytes, err := totalStorageBytes(e)
41+
datasetUFSTotalBytes, err := e.TotalStorageBytes()
5442
if err != nil {
5543
e.Log.Error(err, "Failed to get UfsTotal")
5644
return err
5745
}
5846
ufsTotal := utils.BytesSize(float64(datasetUFSTotalBytes))
5947

60-
fileCount, err := totalFileNums(e)
48+
fileCount, err := e.TotalFileNums()
6149
if err != nil {
6250
e.Log.Error(err, "Failed to get FileNum")
6351
return err

pkg/ddc/efc/metadata_test.go

Lines changed: 0 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package efc
1818

1919
import (
2020
"context"
21-
"errors"
2221

2322
datav1alpha1 "github.com/fluid-cloudnative/fluid/api/v1alpha1"
2423
"github.com/fluid-cloudnative/fluid/pkg/utils/fake"
@@ -29,34 +28,6 @@ import (
2928
)
3029

3130
var _ = Describe("EFCEngine metadata", func() {
32-
var (
33-
originalShouldCheckUFS func(*EFCEngine) (bool, error)
34-
originalTotalStorageBytes func(*EFCEngine) (int64, error)
35-
originalTotalFileNums func(*EFCEngine) (int64, error)
36-
)
37-
38-
BeforeEach(func() {
39-
originalShouldCheckUFS = shouldCheckUFS
40-
originalTotalStorageBytes = totalStorageBytes
41-
originalTotalFileNums = totalFileNums
42-
43-
shouldCheckUFS = func(e *EFCEngine) (bool, error) {
44-
return e.ShouldCheckUFS()
45-
}
46-
totalStorageBytes = func(e *EFCEngine) (int64, error) {
47-
return e.TotalStorageBytes()
48-
}
49-
totalFileNums = func(e *EFCEngine) (int64, error) {
50-
return e.TotalFileNums()
51-
}
52-
})
53-
54-
AfterEach(func() {
55-
shouldCheckUFS = originalShouldCheckUFS
56-
totalStorageBytes = originalTotalStorageBytes
57-
totalFileNums = originalTotalFileNums
58-
})
59-
6031
Describe("syncMetadataInternal", func() {
6132
It("updates dataset metadata using the current UFS totals", func() {
6233
dataset := &datav1alpha1.Dataset{
@@ -81,38 +52,6 @@ var _ = Describe("EFCEngine metadata", func() {
8152
Expect(updated.Status.FileNum).To(Equal("0"))
8253
})
8354

84-
It("returns an error when querying total storage fails", func() {
85-
expectedErr := errors.New("storage failure")
86-
totalStorageBytes = func(*EFCEngine) (int64, error) {
87-
return 0, expectedErr
88-
}
89-
90-
engine := &EFCEngine{
91-
name: "spark",
92-
namespace: "fluid",
93-
Client: fake.NewFakeClientWithScheme(testScheme),
94-
Log: fake.NullLogger(),
95-
}
96-
97-
Expect(engine.syncMetadataInternal()).To(MatchError(expectedErr))
98-
})
99-
100-
It("returns an error when querying total file count fails", func() {
101-
expectedErr := errors.New("file count failure")
102-
totalFileNums = func(*EFCEngine) (int64, error) {
103-
return 0, expectedErr
104-
}
105-
106-
engine := &EFCEngine{
107-
name: "spark",
108-
namespace: "fluid",
109-
Client: fake.NewFakeClientWithScheme(testScheme),
110-
Log: fake.NullLogger(),
111-
}
112-
113-
Expect(engine.syncMetadataInternal()).To(MatchError(expectedErr))
114-
})
115-
11655
It("returns an error when the dataset cannot be loaded", func() {
11756
engine := &EFCEngine{
11857
name: "spark",
@@ -129,39 +68,6 @@ var _ = Describe("EFCEngine metadata", func() {
12968
})
13069

13170
Describe("SyncMetadata", func() {
132-
It("syncs metadata when UFS checks are enabled", func() {
133-
dataset := &datav1alpha1.Dataset{
134-
ObjectMeta: metav1.ObjectMeta{
135-
Name: "spark",
136-
Namespace: "fluid",
137-
},
138-
}
139-
140-
shouldCheckUFS = func(*EFCEngine) (bool, error) {
141-
return true, nil
142-
}
143-
totalStorageBytes = func(*EFCEngine) (int64, error) {
144-
return 1024, nil
145-
}
146-
totalFileNums = func(*EFCEngine) (int64, error) {
147-
return 7, nil
148-
}
149-
150-
engine := &EFCEngine{
151-
name: "spark",
152-
namespace: "fluid",
153-
Client: fake.NewFakeClientWithScheme(testScheme, dataset.DeepCopy()),
154-
Log: fake.NullLogger(),
155-
}
156-
157-
Expect(engine.SyncMetadata()).To(Succeed())
158-
159-
updated := &datav1alpha1.Dataset{}
160-
Expect(engine.Client.Get(context.TODO(), types.NamespacedName{Name: "spark", Namespace: "fluid"}, updated)).To(Succeed())
161-
Expect(updated.Status.UfsTotal).To(Equal("1.00KiB"))
162-
Expect(updated.Status.FileNum).To(Equal("7"))
163-
})
164-
16571
It("skips syncing when the engine does not need UFS metadata checks", func() {
16672
dataset := &datav1alpha1.Dataset{
16773
ObjectMeta: metav1.ObjectMeta{

0 commit comments

Comments
 (0)