diff --git a/pkg/ddc/efc/dataset.go b/pkg/ddc/efc/dataset.go index 0890a76de79..8849af90c48 100644 --- a/pkg/ddc/efc/dataset.go +++ b/pkg/ddc/efc/dataset.go @@ -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 { @@ -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) { diff --git a/pkg/ddc/efc/dataset_test.go b/pkg/ddc/efc/dataset_test.go index db9c35a3c07..2e44d521cd2 100644 --- a/pkg/ddc/efc/dataset_test.go +++ b/pkg/ddc/efc/dataset_test.go @@ -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", @@ -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", @@ -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", @@ -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 @@ -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", @@ -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 diff --git a/pkg/ddc/goosefs/dataset.go b/pkg/ddc/goosefs/dataset.go index 44f70da7b17..7a0aaa536fe 100644 --- a/pkg/ddc/goosefs/dataset.go +++ b/pkg/ddc/goosefs/dataset.go @@ -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 { @@ -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 { diff --git a/pkg/ddc/goosefs/dataset_test.go b/pkg/ddc/goosefs/dataset_test.go index f92fe2eaadf..ac8f9811968 100644 --- a/pkg/ddc/goosefs/dataset_test.go +++ b/pkg/ddc/goosefs/dataset_test.go @@ -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", @@ -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", @@ -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", @@ -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 @@ -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", @@ -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 diff --git a/pkg/ddc/goosefs/health_check_test.go b/pkg/ddc/goosefs/health_check_test.go index 12d483c3870..e81d3c5dc08 100644 --- a/pkg/ddc/goosefs/health_check_test.go +++ b/pkg/ddc/goosefs/health_check_test.go @@ -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", @@ -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 diff --git a/pkg/ddc/jindo/dataset.go b/pkg/ddc/jindo/dataset.go index e0e3b9f3251..443f6cfdeb0 100644 --- a/pkg/ddc/jindo/dataset.go +++ b/pkg/ddc/jindo/dataset.go @@ -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 { @@ -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) { diff --git a/pkg/ddc/jindo/dataset_test.go b/pkg/ddc/jindo/dataset_test.go index edf1ea29403..638404dedfd 100644 --- a/pkg/ddc/jindo/dataset_test.go +++ b/pkg/ddc/jindo/dataset_test.go @@ -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", @@ -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", @@ -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", @@ -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 @@ -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", @@ -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 diff --git a/pkg/ddc/jindocache/dataset.go b/pkg/ddc/jindocache/dataset.go index 083328828a1..21a3b331d17 100644 --- a/pkg/ddc/jindocache/dataset.go +++ b/pkg/ddc/jindocache/dataset.go @@ -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 { @@ -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) { diff --git a/pkg/ddc/jindocache/dataset_test.go b/pkg/ddc/jindocache/dataset_test.go index 4effbfee616..03e60964727 100644 --- a/pkg/ddc/jindocache/dataset_test.go +++ b/pkg/ddc/jindocache/dataset_test.go @@ -241,7 +241,7 @@ 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()) @@ -249,13 +249,11 @@ var _ = Describe("Dataset", func() { 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", @@ -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", @@ -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", @@ -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", @@ -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)) }) }) diff --git a/pkg/ddc/jindofsx/dataset.go b/pkg/ddc/jindofsx/dataset.go index eb7c97c8d8e..bcb5e4e4add 100644 --- a/pkg/ddc/jindofsx/dataset.go +++ b/pkg/ddc/jindofsx/dataset.go @@ -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 { @@ -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) { diff --git a/pkg/ddc/jindofsx/dataset_test.go b/pkg/ddc/jindofsx/dataset_test.go index 54dd9eae9a1..e89fa64258f 100644 --- a/pkg/ddc/jindofsx/dataset_test.go +++ b/pkg/ddc/jindofsx/dataset_test.go @@ -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", @@ -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", @@ -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)) }) }) diff --git a/pkg/ddc/thin/dataset.go b/pkg/ddc/thin/dataset.go index 5d92e5afa50..7e00c4722dc 100644 --- a/pkg/ddc/thin/dataset.go +++ b/pkg/ddc/thin/dataset.go @@ -31,12 +31,6 @@ import ( ) func (t *ThinEngine) UpdateDatasetStatus(phase datav1alpha1.DatasetPhase) (err error) { - runtime, err := t.getRuntime() - if err != nil { - return err - } - - // 2. update the dataset status err = retry.RetryOnConflict(retry.DefaultBackoff, func() error { dataset, err := utils.GetDataset(t.Client, t.name, t.namespace) if err != nil { @@ -85,7 +79,6 @@ func (t *ThinEngine) UpdateDatasetStatus(phase datav1alpha1.DatasetPhase) (err e cond) } - datasetToUpdate.Status.CacheStates = runtime.Status.CacheStates if !reflect.DeepEqual(dataset.Status, datasetToUpdate.Status) { t.Log.V(1).Info("Update DatasetStatus", "dataset", fmt.Sprintf("%s/%s", datasetToUpdate.GetNamespace(), datasetToUpdate.GetName())) err = t.Client.Status().Update(context.TODO(), datasetToUpdate) diff --git a/pkg/ddc/thin/dataset_test.go b/pkg/ddc/thin/dataset_test.go index 017009cc5e9..6b904c3c885 100644 --- a/pkg/ddc/thin/dataset_test.go +++ b/pkg/ddc/thin/dataset_test.go @@ -91,9 +91,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", @@ -110,9 +107,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", @@ -129,9 +123,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", @@ -155,7 +146,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 @@ -218,9 +208,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", @@ -240,7 +227,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 diff --git a/pkg/ddc/thin/health_check_test.go b/pkg/ddc/thin/health_check_test.go index 7b9e1594f6f..709a3edb022 100644 --- a/pkg/ddc/thin/health_check_test.go +++ b/pkg/ddc/thin/health_check_test.go @@ -218,7 +218,6 @@ var _ = Describe("ThinEngine Health Check", Label("pkg.ddc.thin.health_check_tes } Expect(hbaseDataset).NotTo(BeNil()) Expect(hbaseDataset.Status.Phase).To(Equal(datav1alpha1.BoundDatasetPhase)) - Expect(hbaseDataset.Status.CacheStates).To(Equal(common.CacheStateList{common.Cached: "true"})) }) }) diff --git a/pkg/ddc/vineyard/dataset.go b/pkg/ddc/vineyard/dataset.go index b6eb6fca651..2a604759a6c 100644 --- a/pkg/ddc/vineyard/dataset.go +++ b/pkg/ddc/vineyard/dataset.go @@ -71,12 +71,6 @@ func (e *VineyardEngine) UpdateCacheOfDataset() (err error) { // UpdateDatasetStatus updates the status of the dataset func (e *VineyardEngine) UpdateDatasetStatus(phase datav1alpha1.DatasetPhase) (err error) { - 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 { @@ -120,8 +114,6 @@ func (e *VineyardEngine) UpdateDatasetStatus(phase datav1alpha1.DatasetPhase) (e datasetToUpdate.Status.Conditions = utils.UpdateDatasetCondition(datasetToUpdate.Status.Conditions, cond) - datasetToUpdate.Status.CacheStates = runtime.Status.CacheStates - if !reflect.DeepEqual(dataset.Status, datasetToUpdate.Status) { err = e.Client.Status().Update(context.TODO(), datasetToUpdate) if err != nil { diff --git a/pkg/ddc/vineyard/dataset_test.go b/pkg/ddc/vineyard/dataset_test.go index f93233da2a1..3fe8c491d3c 100644 --- a/pkg/ddc/vineyard/dataset_test.go +++ b/pkg/ddc/vineyard/dataset_test.go @@ -170,9 +170,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", @@ -198,9 +195,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", @@ -217,9 +211,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", @@ -243,7 +234,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 @@ -306,9 +296,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", @@ -328,7 +315,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 diff --git a/pkg/ddc/vineyard/health_check_test.go b/pkg/ddc/vineyard/health_check_test.go index eaa6ee84f2d..d2a07c9293e 100644 --- a/pkg/ddc/vineyard/health_check_test.go +++ b/pkg/ddc/vineyard/health_check_test.go @@ -164,9 +164,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", @@ -231,7 +228,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