Skip to content

refactor: remove redundant CacheStates update from UpdateDatasetStatu… #5813

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

Open
lin121291 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

refactor: remove redundant CacheStates update from UpdateDatasetStatu… #5813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ea4a95
refactor: remove redundant CacheStates update from UpdateDatasetStatu…
lin121291 Apr 28, 2026
bbc1314
fix: update tests for jindocache, jindofsx, and thin to remove CacheS…
lin121291 Apr 28, 2026
3c00d10
fix: update tests for goosefs and vineyard to remove CacheStates asse…
lin121291 Apr 28, 2026
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
9 changes: 0 additions & 9 deletions pkg/ddc/efc/dataset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,6 @@ func (e *EFCEngine) BindToDataset() (err error) {

// UpdateDatasetStatus updates the status of the dataset
func (e *EFCEngine) UpdateDatasetStatus(phase datav1alpha1.DatasetPhase) (err error) {
// 1. update the runtime status
runtime, err := e.getRuntime()
if err != nil {
return err
}

// 2.update the dataset status
err = retry.RetryOnConflict(retry.DefaultBackoff, func() error {
dataset, err := utils.GetDataset(e.Client, e.name, e.namespace)
if err != nil {
Expand Down Expand Up @@ -89,8 +82,6 @@ func (e *EFCEngine) UpdateDatasetStatus(phase datav1alpha1.DatasetPhase) (err er
cond)
}

datasetToUpdate.Status.CacheStates = runtime.Status.CacheStates

e.Log.Info("the dataset status", "status", datasetToUpdate.Status)

if !reflect.DeepEqual(dataset.Status, datasetToUpdate.Status) {
Expand Down
14 changes: 0 additions & 14 deletions pkg/ddc/efc/dataset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,6 @@ func TestUpdateDatasetStatus(t *testing.T) {
},
Status: datav1alpha1.DatasetStatus{
Phase: datav1alpha1.BoundDatasetPhase,
CacheStates: map[common.CacheStateName]string{
common.Cached: "true",
},
HCFSStatus: &datav1alpha1.HCFSStatus{
Endpoint: "test Endpoint",
UnderlayerFileSystemVersion: "Underlayer HCFS Compatible Version",
Expand All @@ -193,9 +190,6 @@ func TestUpdateDatasetStatus(t *testing.T) {
},
Status: datav1alpha1.DatasetStatus{
Phase: datav1alpha1.FailedDatasetPhase,
CacheStates: map[common.CacheStateName]string{
common.Cached: "true",
},
HCFSStatus: &datav1alpha1.HCFSStatus{
Endpoint: "test Endpoint",
UnderlayerFileSystemVersion: "Underlayer HCFS Compatible Version",
Expand All @@ -212,9 +206,6 @@ func TestUpdateDatasetStatus(t *testing.T) {
},
Status: datav1alpha1.DatasetStatus{
Phase: datav1alpha1.NoneDatasetPhase,
CacheStates: map[common.CacheStateName]string{
common.Cached: "true",
},
HCFSStatus: &datav1alpha1.HCFSStatus{
Endpoint: "test Endpoint",
UnderlayerFileSystemVersion: "Underlayer HCFS Compatible Version",
Expand All @@ -238,7 +229,6 @@ func TestUpdateDatasetStatus(t *testing.T) {
return
}
if !reflect.DeepEqual(datasets.Items[0].Status.Phase, test.expectedResult.Status.Phase) ||
!reflect.DeepEqual(datasets.Items[0].Status.CacheStates, test.expectedResult.Status.CacheStates) ||
!reflect.DeepEqual(datasets.Items[0].Status.HCFSStatus, test.expectedResult.Status.HCFSStatus) {
t.Errorf("fail to exec the function with error %v", err)
return
Expand Down Expand Up @@ -301,9 +291,6 @@ func TestBindToDataset(t *testing.T) {
},
Status: datav1alpha1.DatasetStatus{
Phase: datav1alpha1.BoundDatasetPhase,
CacheStates: map[common.CacheStateName]string{
common.Cached: "true",
},
HCFSStatus: &datav1alpha1.HCFSStatus{
Endpoint: "test Endpoint",
UnderlayerFileSystemVersion: "Underlayer HCFS Compatible Version",
Expand All @@ -323,7 +310,6 @@ func TestBindToDataset(t *testing.T) {
return
}
if !reflect.DeepEqual(datasets.Items[0].Status.Phase, expectedResult.Status.Phase) ||
!reflect.DeepEqual(datasets.Items[0].Status.CacheStates, expectedResult.Status.CacheStates) ||
!reflect.DeepEqual(datasets.Items[0].Status.HCFSStatus, expectedResult.Status.HCFSStatus) {
t.Errorf("fail to exec the function with error %v", err)
return
Expand Down
10 changes: 0 additions & 10 deletions pkg/ddc/goosefs/dataset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,6 @@ func (e *GooseFSEngine) UpdateCacheOfDataset() (err error) {

// UpdateDatasetStatus updates the status of the dataset
func (e *GooseFSEngine) UpdateDatasetStatus(phase datav1alpha1.DatasetPhase) (err error) {
// 1. update the runtime status
runtime, err := e.getRuntime()
if err != nil {
return err
}

// 2.update the dataset status
err = retry.RetryOnConflict(retry.DefaultBackoff, func() error {
dataset, err := utils.GetDataset(e.Client, e.name, e.namespace)
if err != nil {
Expand Down Expand Up @@ -123,9 +116,6 @@ func (e *GooseFSEngine) UpdateDatasetStatus(phase datav1alpha1.DatasetPhase) (er
cond)
}

datasetToUpdate.Status.CacheStates = runtime.Status.CacheStates
// datasetToUpdate.Status.CacheStates =

if datasetToUpdate.Status.HCFSStatus == nil {
datasetToUpdate.Status.HCFSStatus, err = e.GetHCFSStatus()
if err != nil {
Expand Down
14 changes: 0 additions & 14 deletions pkg/ddc/goosefs/dataset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,6 @@ func TestUpdateDatasetStatus(t *testing.T) {
},
Status: datav1alpha1.DatasetStatus{
Phase: datav1alpha1.BoundDatasetPhase,
CacheStates: map[common.CacheStateName]string{
common.Cached: "true",
},
HCFSStatus: &datav1alpha1.HCFSStatus{
Endpoint: "test Endpoint",
UnderlayerFileSystemVersion: "Underlayer HCFS Compatible Version",
Expand All @@ -197,9 +194,6 @@ func TestUpdateDatasetStatus(t *testing.T) {
},
Status: datav1alpha1.DatasetStatus{
Phase: datav1alpha1.FailedDatasetPhase,
CacheStates: map[common.CacheStateName]string{
common.Cached: "true",
},
HCFSStatus: &datav1alpha1.HCFSStatus{
Endpoint: "test Endpoint",
UnderlayerFileSystemVersion: "Underlayer HCFS Compatible Version",
Expand All @@ -216,9 +210,6 @@ func TestUpdateDatasetStatus(t *testing.T) {
},
Status: datav1alpha1.DatasetStatus{
Phase: datav1alpha1.NoneDatasetPhase,
CacheStates: map[common.CacheStateName]string{
common.Cached: "true",
},
HCFSStatus: &datav1alpha1.HCFSStatus{
Endpoint: "test Endpoint",
UnderlayerFileSystemVersion: "Underlayer HCFS Compatible Version",
Expand All @@ -242,7 +233,6 @@ func TestUpdateDatasetStatus(t *testing.T) {
return
}
if !reflect.DeepEqual(datasets.Items[0].Status.Phase, test.expectedResult.Status.Phase) ||
!reflect.DeepEqual(datasets.Items[0].Status.CacheStates, test.expectedResult.Status.CacheStates) ||
!reflect.DeepEqual(datasets.Items[0].Status.HCFSStatus, test.expectedResult.Status.HCFSStatus) {
t.Errorf("fail to exec the function with error %v", err)
return
Expand Down Expand Up @@ -305,9 +295,6 @@ func TestBindToDataset(t *testing.T) {
},
Status: datav1alpha1.DatasetStatus{
Phase: datav1alpha1.BoundDatasetPhase,
CacheStates: map[common.CacheStateName]string{
common.Cached: "true",
},
HCFSStatus: &datav1alpha1.HCFSStatus{
Endpoint: "test Endpoint",
UnderlayerFileSystemVersion: "Underlayer HCFS Compatible Version",
Expand All @@ -327,7 +314,6 @@ func TestBindToDataset(t *testing.T) {
return
}
if !reflect.DeepEqual(datasets.Items[0].Status.Phase, expectedResult.Status.Phase) ||
!reflect.DeepEqual(datasets.Items[0].Status.CacheStates, expectedResult.Status.CacheStates) ||
!reflect.DeepEqual(datasets.Items[0].Status.HCFSStatus, expectedResult.Status.HCFSStatus) {
t.Errorf("fail to exec the function with error %v", err)
return
Expand Down
4 changes: 0 additions & 4 deletions pkg/ddc/goosefs/health_check_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,6 @@ func TestCheckRuntimeHealthy(t *testing.T) {
},
Status: datav1alpha1.DatasetStatus{
Phase: datav1alpha1.BoundDatasetPhase,
CacheStates: map[common.CacheStateName]string{
common.Cached: "true",
},
HCFSStatus: &datav1alpha1.HCFSStatus{
Endpoint: "test Endpoint",
UnderlayerFileSystemVersion: "Underlayer HCFS Compatible Version",
Expand Down Expand Up @@ -236,7 +233,6 @@ func TestCheckRuntimeHealthy(t *testing.T) {
return
}
if !reflect.DeepEqual(datasets.Items[0].Status.Phase, test.expectedDataset.Status.Phase) ||
!reflect.DeepEqual(datasets.Items[0].Status.CacheStates, test.expectedDataset.Status.CacheStates) ||
!reflect.DeepEqual(datasets.Items[0].Status.HCFSStatus, test.expectedDataset.Status.HCFSStatus) {
t.Errorf("fail to exec the function with error %v", err)
return
Expand Down
9 changes: 0 additions & 9 deletions pkg/ddc/jindo/dataset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,6 @@ import (
// Returns:
// - err (error): Returns an error if the update process fails, otherwise returns nil.
func (e *JindoEngine) UpdateDatasetStatus(phase datav1alpha1.DatasetPhase) (err error) {
// 1. update the runtime status
runtime, err := e.getRuntime()
if err != nil {
return err
}

// 2.update the dataset status
err = retry.RetryOnConflict(retry.DefaultBackoff, func() error {
dataset, err := utils.GetDataset(e.Client, e.name, e.namespace)
if err != nil {
Expand Down Expand Up @@ -73,8 +66,6 @@ func (e *JindoEngine) UpdateDatasetStatus(phase datav1alpha1.DatasetPhase) (err
datasetToUpdate.Status.Conditions = utils.UpdateDatasetCondition(datasetToUpdate.Status.Conditions,
cond)
}
datasetToUpdate.Status.CacheStates = runtime.Status.CacheStates

e.Log.Info("the dataset status", "status", datasetToUpdate.Status)

if !reflect.DeepEqual(dataset.Status, datasetToUpdate.Status) {
Expand Down
14 changes: 0 additions & 14 deletions pkg/ddc/jindo/dataset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,6 @@ func TestUpdateDatasetStatus(t *testing.T) {
},
Status: datav1alpha1.DatasetStatus{
Phase: datav1alpha1.BoundDatasetPhase,
CacheStates: map[common.CacheStateName]string{
common.Cached: "true",
},
HCFSStatus: &datav1alpha1.HCFSStatus{
Endpoint: "test Endpoint",
UnderlayerFileSystemVersion: "Underlayer HCFS Compatible Version",
Expand All @@ -218,9 +215,6 @@ func TestUpdateDatasetStatus(t *testing.T) {
},
Status: datav1alpha1.DatasetStatus{
Phase: datav1alpha1.FailedDatasetPhase,
CacheStates: map[common.CacheStateName]string{
common.Cached: "true",
},
HCFSStatus: &datav1alpha1.HCFSStatus{
Endpoint: "test Endpoint",
UnderlayerFileSystemVersion: "Underlayer HCFS Compatible Version",
Expand All @@ -237,9 +231,6 @@ func TestUpdateDatasetStatus(t *testing.T) {
},
Status: datav1alpha1.DatasetStatus{
Phase: datav1alpha1.NoneDatasetPhase,
CacheStates: map[common.CacheStateName]string{
common.Cached: "true",
},
HCFSStatus: &datav1alpha1.HCFSStatus{
Endpoint: "test Endpoint",
UnderlayerFileSystemVersion: "Underlayer HCFS Compatible Version",
Expand All @@ -263,7 +254,6 @@ func TestUpdateDatasetStatus(t *testing.T) {
return
}
if !reflect.DeepEqual(datasets.Items[0].Status.Phase, test.expectedResult.Status.Phase) ||
!reflect.DeepEqual(datasets.Items[0].Status.CacheStates, test.expectedResult.Status.CacheStates) ||
!reflect.DeepEqual(datasets.Items[0].Status.HCFSStatus, test.expectedResult.Status.HCFSStatus) {
t.Errorf("fail to exec the function with error %v", err)
return
Expand Down Expand Up @@ -329,9 +319,6 @@ func TestBindToDataset(t *testing.T) {
},
Status: datav1alpha1.DatasetStatus{
Phase: datav1alpha1.BoundDatasetPhase,
CacheStates: map[common.CacheStateName]string{
common.Cached: "true",
},
HCFSStatus: &datav1alpha1.HCFSStatus{
Endpoint: "test Endpoint",
UnderlayerFileSystemVersion: "Underlayer HCFS Compatible Version",
Expand All @@ -351,7 +338,6 @@ func TestBindToDataset(t *testing.T) {
return
}
if !reflect.DeepEqual(datasets.Items[0].Status.Phase, expectedResult.Status.Phase) ||
!reflect.DeepEqual(datasets.Items[0].Status.CacheStates, expectedResult.Status.CacheStates) ||
!reflect.DeepEqual(datasets.Items[0].Status.HCFSStatus, expectedResult.Status.HCFSStatus) {
t.Errorf("fail to exec the function with error %v", err)
return
Expand Down
9 changes: 0 additions & 9 deletions pkg/ddc/jindocache/dataset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,6 @@ import (
)

func (e *JindoCacheEngine) UpdateDatasetStatus(phase datav1alpha1.DatasetPhase) (err error) {
// 1. update the runtime status
runtime, err := e.getRuntime()
if err != nil {
return err
}

// 2.update the dataset status
err = retry.RetryOnConflict(retry.DefaultBackoff, func() error {
dataset, err := utils.GetDataset(e.Client, e.name, e.namespace)
if err != nil {
Expand Down Expand Up @@ -75,8 +68,6 @@ func (e *JindoCacheEngine) UpdateDatasetStatus(phase datav1alpha1.DatasetPhase)
datasetToUpdate.Status.Conditions = utils.UpdateDatasetCondition(datasetToUpdate.Status.Conditions,
cond)
}
datasetToUpdate.Status.CacheStates = runtime.Status.CacheStates

e.Log.Info("the dataset status", "status", datasetToUpdate.Status)

if !reflect.DeepEqual(dataset.Status, datasetToUpdate.Status) {
Expand Down
10 changes: 1 addition & 9 deletions pkg/ddc/jindocache/dataset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,21 +241,19 @@ var _ = Describe("Dataset", func() {
})

DescribeTable("updating dataset phase",
func(phase datav1alpha1.DatasetPhase, expectedPhase datav1alpha1.DatasetPhase, expectedCacheStates common.CacheStateList, expectedHCFSStatus *datav1alpha1.HCFSStatus) {
func(phase datav1alpha1.DatasetPhase, expectedPhase datav1alpha1.DatasetPhase, expectedHCFSStatus *datav1alpha1.HCFSStatus) {
err := engine.UpdateDatasetStatus(phase)
Expect(err).NotTo(HaveOccurred())

var datasets datav1alpha1.DatasetList
err = client.List(context.TODO(), &datasets)
Expect(err).NotTo(HaveOccurred())
Expect(datasets.Items[0].Status.Phase).To(Equal(expectedPhase))
Expect(datasets.Items[0].Status.CacheStates).To(Equal(expectedCacheStates))
Expect(datasets.Items[0].Status.HCFSStatus).To(Equal(expectedHCFSStatus))
},
Entry("with Bound phase",
datav1alpha1.BoundDatasetPhase,
datav1alpha1.BoundDatasetPhase,
common.CacheStateList{common.Cached: "true"},
&datav1alpha1.HCFSStatus{
Endpoint: "test Endpoint",
UnderlayerFileSystemVersion: "Underlayer HCFS Compatible Version",
Expand All @@ -264,7 +262,6 @@ var _ = Describe("Dataset", func() {
Entry("with Failed phase",
datav1alpha1.FailedDatasetPhase,
datav1alpha1.FailedDatasetPhase,
common.CacheStateList{common.Cached: "true"},
&datav1alpha1.HCFSStatus{
Endpoint: "test Endpoint",
UnderlayerFileSystemVersion: "Underlayer HCFS Compatible Version",
Expand All @@ -273,7 +270,6 @@ var _ = Describe("Dataset", func() {
Entry("with None phase",
datav1alpha1.NoneDatasetPhase,
datav1alpha1.NoneDatasetPhase,
common.CacheStateList{common.Cached: "true"},
&datav1alpha1.HCFSStatus{
Endpoint: "test Endpoint",
UnderlayerFileSystemVersion: "Underlayer HCFS Compatible Version",
Expand Down Expand Up @@ -338,9 +334,6 @@ var _ = Describe("Dataset", func() {
},
Status: datav1alpha1.DatasetStatus{
Phase: datav1alpha1.BoundDatasetPhase,
CacheStates: map[common.CacheStateName]string{
common.Cached: "true",
},
HCFSStatus: &datav1alpha1.HCFSStatus{
Endpoint: "test Endpoint",
UnderlayerFileSystemVersion: "Underlayer HCFS Compatible Version",
Expand All @@ -354,7 +347,6 @@ var _ = Describe("Dataset", func() {
err = client.List(context.TODO(), &datasets)
Expect(err).NotTo(HaveOccurred())
Expect(datasets.Items[0].Status.Phase).To(Equal(expectedResult.Status.Phase))
Expect(datasets.Items[0].Status.CacheStates).To(Equal(expectedResult.Status.CacheStates))
Expect(datasets.Items[0].Status.HCFSStatus).To(Equal(expectedResult.Status.HCFSStatus))
})
})
Expand Down
9 changes: 0 additions & 9 deletions pkg/ddc/jindofsx/dataset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,6 @@ import (
)

func (e *JindoFSxEngine) UpdateDatasetStatus(phase datav1alpha1.DatasetPhase) (err error) {
// 1. update the runtime status
runtime, err := e.getRuntime()
if err != nil {
return err
}

// 2.update the dataset status
err = retry.RetryOnConflict(retry.DefaultBackoff, func() error {
dataset, err := utils.GetDataset(e.Client, e.name, e.namespace)
if err != nil {
Expand Down Expand Up @@ -75,8 +68,6 @@ func (e *JindoFSxEngine) UpdateDatasetStatus(phase datav1alpha1.DatasetPhase) (e
datasetToUpdate.Status.Conditions = utils.UpdateDatasetCondition(datasetToUpdate.Status.Conditions,
cond)
}
datasetToUpdate.Status.CacheStates = runtime.Status.CacheStates

e.Log.Info("the dataset status", "status", datasetToUpdate.Status)

if !reflect.DeepEqual(dataset.Status, datasetToUpdate.Status) {
Expand Down
7 changes: 0 additions & 7 deletions pkg/ddc/jindofsx/dataset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,9 +247,6 @@ var _ = Describe("JindoFSxEngine Dataset Operations", func() {
err = fakeClient.List(context.TODO(), &datasets)
Expect(err).NotTo(HaveOccurred())
Expect(datasets.Items[0].Status.Phase).To(Equal(expectedPhase))
Expect(datasets.Items[0].Status.CacheStates).To(Equal(common.CacheStateList{
common.Cached: "true",
}))
Expect(datasets.Items[0].Status.HCFSStatus).To(Equal(&datav1alpha1.HCFSStatus{
Endpoint: "test Endpoint",
UnderlayerFileSystemVersion: "Underlayer HCFS Compatible Version",
Expand Down Expand Up @@ -317,9 +314,6 @@ var _ = Describe("JindoFSxEngine Dataset Operations", func() {
},
Status: datav1alpha1.DatasetStatus{
Phase: datav1alpha1.BoundDatasetPhase,
CacheStates: map[common.CacheStateName]string{
common.Cached: "true",
},
HCFSStatus: &datav1alpha1.HCFSStatus{
Endpoint: "test Endpoint",
UnderlayerFileSystemVersion: "Underlayer HCFS Compatible Version",
Expand All @@ -334,7 +328,6 @@ var _ = Describe("JindoFSxEngine Dataset Operations", func() {
err = client.List(context.TODO(), &datasets)
Expect(err).NotTo(HaveOccurred())
Expect(datasets.Items[0].Status.Phase).To(Equal(expectedResult.Status.Phase))
Expect(datasets.Items[0].Status.CacheStates).To(Equal(expectedResult.Status.CacheStates))
Expect(datasets.Items[0].Status.HCFSStatus).To(Equal(expectedResult.Status.HCFSStatus))
})
})
Expand Down
Loading
Loading