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

Remove redundant lock #444

Merged
merged 1 commit into from
Mar 29, 2019
+1 −13
Merged

Remove redundant lock #444

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 1 addition & 13 deletions pkg/controller/studyjob/studyjob_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (
"context"
"log"
"strconv"
"sync"

"github.com/kubeflow/katib/pkg"
katibapi "github.com/kubeflow/katib/pkg/api"
Expand Down Expand Up @@ -79,7 +78,7 @@ func Add(mgr manager.Manager) error {

// newReconciler returns a new reconcile.Reconciler
func newReconciler(mgr manager.Manager) (reconcile.Reconciler, error) {
return &ReconcileStudyJobController{Client: mgr.GetClient(), scheme: mgr.GetScheme(), muxMap: sync.Map{}}, nil
return &ReconcileStudyJobController{Client: mgr.GetClient(), scheme: mgr.GetScheme()}, nil
}

// add adds a new Controller to mgr with r as the reconcile.Reconciler
Expand Down Expand Up @@ -175,7 +174,6 @@ var _ reconcile.Reconciler = &ReconcileStudyJobController{}
type ReconcileStudyJobController struct {
client.Client
scheme *runtime.Scheme
muxMap sync.Map
}

type WorkerStatus struct {
Expand All @@ -193,19 +191,9 @@ type WorkerStatus struct {
func (r *ReconcileStudyJobController) Reconcile(request reconcile.Request) (reconcile.Result, error) {
// Fetch the StudyJob instance
instance := &katibv1alpha1.StudyJob{}
mux := new(sync.Mutex)
if m, loaded := r.muxMap.LoadOrStore(request.NamespacedName.String(), mux); loaded {
mux, _ = m.(*sync.Mutex)
}
mux.Lock()
defer mux.Unlock()
err := r.Get(context.TODO(), request.NamespacedName, instance)
if err != nil {
if errors.IsNotFound(err) {
if _, ok := r.muxMap.Load(request.NamespacedName.String()); ok {
log.Printf("Study %s was deleted. Resouces will be released.", request.NamespacedName.String())
r.muxMap.Delete(request.NamespacedName.String())
}
// Object not found, return. Created objects are automatically garbage collected.
// For additional cleanup logic use finalizers.
return reconcile.Result{}, nil
Expand Down