Skip to content
Merged
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
11 changes: 8 additions & 3 deletions pkg/controller.v1beta1/experiment/experiment_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -355,8 +355,14 @@ func (r *ReconcileExperiment) createTrials(instance *experimentsv1beta1.Experime
}
var trialNames []string
for _, trial := range trials {
if err = r.createTrialInstance(instance, &trial); err != nil {
logger.Error(err, "Create trial instance error", "trial", trial)
trialInstance, err := r.getTrialInstance(instance, &trial)
if err != nil {
logger.Error(err, "Get trial instance error", "trial", trial)
return err
}
// Due to unsynchronised policy of Kubernetes controllers, trial creation can fail.
if err = r.Create(context.TODO(), trialInstance); err != nil {
logger.Error(err, "Trial create error", "Trial name", trial.Name)
continue
}
trialNames = append(trialNames, trial.Name)
Expand All @@ -365,7 +371,6 @@ func (r *ReconcileExperiment) createTrials(instance *experimentsv1beta1.Experime
if len(trialNames) != 0 {
logger.Info("Created Trials", "trialNames", trialNames)
}

return nil
}

Expand Down
13 changes: 4 additions & 9 deletions pkg/controller.v1beta1/experiment/experiment_controller_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const (
updatePrometheusMetrics = "update-prometheus-metrics"
)

func (r *ReconcileExperiment) createTrialInstance(expInstance *experimentsv1beta1.Experiment, trialAssignment *suggestionsv1beta1.TrialAssignment) error {
func (r *ReconcileExperiment) getTrialInstance(expInstance *experimentsv1beta1.Experiment, trialAssignment *suggestionsv1beta1.TrialAssignment) (*trialsv1beta1.Trial, error) {
logger := log.WithValues("Experiment", types.NamespacedName{Name: expInstance.GetName(), Namespace: expInstance.GetNamespace()})

trial := &trialsv1beta1.Trial{}
Expand All @@ -46,7 +46,7 @@ func (r *ReconcileExperiment) createTrialInstance(expInstance *experimentsv1beta

if err := controllerutil.SetControllerReference(expInstance, trial, r.scheme); err != nil {
logger.Error(err, "Set controller reference error")
return err
return nil, err
}

trial.Spec.Objective = expInstance.Spec.Objective
Expand All @@ -61,7 +61,7 @@ func (r *ReconcileExperiment) createTrialInstance(expInstance *experimentsv1beta
runSpec, err := r.GetRunSpecWithHyperParameters(expInstance, trial.Name, trial.Namespace, hps)
if err != nil {
logger.Error(err, "Fail to get RunSpec from experiment", expInstance.Name)
return err
return nil, err
}

trial.Spec.RunSpec = runSpec
Expand All @@ -86,12 +86,7 @@ func (r *ReconcileExperiment) createTrialInstance(expInstance *experimentsv1beta
trial.Spec.FailureCondition = expInstance.Spec.TrialTemplate.FailureCondition
}

if err := r.Create(context.TODO(), trial); err != nil {
logger.Error(err, "Trial create error", "Trial name", trial.Name)
return err
}
return nil

return trial, nil
}

func needUpdateFinalizers(exp *experimentsv1beta1.Experiment) (bool, []string) {
Expand Down