Skip to content
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

Jump to bottom

fix: Avoid side effect #532

Merged
merged 2 commits into from
May 16, 2019
Merged

fix: Avoid side effect #532

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f217de
fix: Avoid side effect
gaocegege May 16, 2019
2bb3b51
fix: Remove
gaocegege May 16, 2019
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
61 changes: 45 additions & 16 deletions pkg/controller/v1alpha2/trial/trial_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,12 +189,22 @@ func (r *ReconcileTrial) reconcileTrial(instance *trialsv1alpha2.Trial) error {
logger.Error(err, "Job Spec Get error")
return err
}
desiredMetricsCollector, err := r.getDesiredMetricsCollectorSpec(instance)
if err != nil {
logger.Error(err, "Metrics Collector Get error")
return err
}

deployedJob, err := r.reconcileJob(instance, desiredJob)
if err != nil {
logger.Error(err, "Reconcile job error")
return err
}
_, err = r.reconcileMetricsCollector(instance, desiredMetricsCollector)
if err != nil {
logger.Error(err, "Reconcile Metrics Collector error")
return err
}

//Job already exists
//TODO Can desired Spec differ from deployedSpec?
Expand Down Expand Up @@ -224,7 +234,8 @@ func (r *ReconcileTrial) reconcileJob(instance *trialsv1alpha2.Trial, desiredJob
err = r.Get(context.TODO(), types.NamespacedName{Name: desiredJob.GetName(), Namespace: desiredJob.GetNamespace()}, deployedJob)
if err != nil {
if errors.IsNotFound(err) {
logger.Info("Creating Job", "kind", kind)
logger.Info("Creating Job", "kind", kind,
"name", desiredJob.GetName())
err = r.Create(context.TODO(), desiredJob)
if err != nil {
logger.Error(err, "Create job error")
Expand All @@ -236,12 +247,6 @@ func (r *ReconcileTrial) reconcileJob(instance *trialsv1alpha2.Trial, desiredJob
}
}

err = r.spawnMetricsCollector(instance)
if err != nil {
logger.Error(err, "Metrics collector spawning error")
return nil, err
}

msg := "Trial is running"
instance.MarkTrialStatusRunning(trialutil.TrialRunningReason, msg)
return deployedJob, nil
Expand All @@ -266,24 +271,48 @@ func (r *ReconcileTrial) getDesiredJobSpec(instance *trialsv1alpha2.Trial) (*uns
return desiredJobSpec, nil
}

func (r *ReconcileTrial) spawnMetricsCollector(instance *trialsv1alpha2.Trial) error {
var mcjob batchv1beta.CronJob
func (r *ReconcileTrial) getDesiredMetricsCollectorSpec(instance *trialsv1alpha2.Trial) (*batchv1beta.CronJob, error) {
mcjob := &batchv1beta.CronJob{}
bufSize := 1024
logger := log.WithValues("Metrics collector for Trial", types.NamespacedName{Name: instance.GetName(), Namespace: instance.GetNamespace()})
buf := bytes.NewBufferString(instance.Spec.MetricsCollectorSpec)

if err := k8syaml.NewYAMLOrJSONDecoder(buf, bufSize).Decode(mcjob); err != nil {
logger.Error(err, "Yaml decode error")
return err
return nil, err
}
if err := controllerutil.SetControllerReference(instance, &mcjob, r.scheme); err != nil {
if err := controllerutil.SetControllerReference(instance, mcjob, r.scheme); err != nil {
logger.Error(err, "Set controller reference error")
return err
return nil, err
}
if err := r.Create(context.TODO(), &mcjob); err != nil {
logger.Error(err, "MetricsCollector Job Create error")
return err
return mcjob, nil
}

func (r *ReconcileTrial) reconcileMetricsCollector(instance *trialsv1alpha2.Trial,
desiredMetricsCollector *batchv1beta.CronJob) (*batchv1beta.CronJob, error) {
var err error
logger := log.WithValues("Trial", types.NamespacedName{Name: instance.GetName(), Namespace: instance.GetNamespace()})

deployedMetricsCollector := &batchv1beta.CronJob{}
err = r.Get(context.TODO(), types.NamespacedName{
Name: desiredMetricsCollector.GetName(),
Namespace: desiredMetricsCollector.GetNamespace(),
}, deployedMetricsCollector)
if err != nil {
if errors.IsNotFound(err) {
logger.Info("Creating Metrics Collector",
"name", desiredMetricsCollector.GetName(),
"namespace", desiredMetricsCollector.GetNamespace())
err = r.Create(context.TODO(), desiredMetricsCollector)
if err != nil {
logger.Error(err, "Create Metrics Collector error")
return nil, err
}
} else {
logger.Error(err, "Metrics Collector Get error")
return nil, err
}
}

return nil
return deployedMetricsCollector, nil
}