Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 12 additions & 13 deletions pkg/ddc/thin/referencedataset/engine.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,18 @@ func BuildReferenceDatasetThinEngine(id string, ctx cruntime.ReconcileRequestCon
engine.Log = ctx.Log.WithValues("virtual engine", ctx.RuntimeType).WithValues("id", id)

// check if support the dataset mount format
err := engine.checkDatasetMountSupport()
dataset, err := utils.GetDataset(ctx.Client, ctx.Name, ctx.Namespace)
if err != nil {
return nil, err
if utils.IgnoreNotFound(err) == nil {
engine.Log.Info("The dataset is not found, pass checkDatasetMountSupport because runtime is deleting")
} else {
return nil, err
}
} else {
err = engine.checkDatasetMountSupport(dataset)
if err != nil {
return nil, err
}
}

// Build and setup runtime info
Expand Down Expand Up @@ -221,17 +230,7 @@ func (e *ReferenceDatasetEngine) Shutdown() (err error) {
return
}

func (e *ReferenceDatasetEngine) checkDatasetMountSupport() error {
dataset, err := utils.GetDataset(e.Client, e.name, e.namespace)
if err != nil {
// not found dataset error indicates the runtime is deleting, pass checkDatasetMountSupport
if utils.IgnoreNotFound(err) == nil {
e.Log.Info("The dataset is not found, pass checkDatasetMountSupport because runtime is deleting")
return nil
} else {
return err
}
}
func (e *ReferenceDatasetEngine) checkDatasetMountSupport(dataset *v1alpha1.Dataset) error {

physicalDatasetNamespacedName := base.GetPhysicalDatasetFromMounts(dataset.Spec.Mounts)
physicalSize := len(physicalDatasetNamespacedName)
Expand Down
8 changes: 6 additions & 2 deletions pkg/ddc/thin/referencedataset/validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/fluid-cloudnative/fluid/pkg/runtime"
)

func (e *ReferenceDatasetEngine) Validate(runtime.ReconcileRequestContext) (err error) {
func (e *ReferenceDatasetEngine) Validate(ctx runtime.ReconcileRequestContext) (err error) {
// XXXEngine.runtimeInfo must have full information about the bound dataset for further reconcilation.
// getRuntimeInfo() here is a refresh to make sure the information is correctly set
runtimeInfo, err := e.getRuntimeInfo()
Expand All @@ -34,6 +34,10 @@ func (e *ReferenceDatasetEngine) Validate(runtime.ReconcileRequestContext) (err
return err
}

// TODO: impl validation logic for AlluxioEngine
err = e.checkDatasetMountSupport(ctx.Dataset)
if err != nil {
return err
}

return nil
}
Loading