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

Optimize Advanced DaemonSet internal new pod for imitating scheduling #1011

Merged
merged 1 commit into from
Jun 30, 2022
Merged

Optimize Advanced DaemonSet internal new pod for imitating scheduling #1011

Show file tree
Hide file tree
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
18 changes: 17 additions & 1 deletion pkg/controller/daemonset/daemonset_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
ds := e.Object.(*appsv1alpha1.DaemonSet)
klog.V(4).Infof("Deleting DaemonSet %s/%s", ds.Namespace, ds.Name)
dsc.expectations.DeleteExpectations(keyFunc(ds))
newPodForDSCache.Delete(ds.UID)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plz delete entry of ds.UID if daemonset is not found in the beginning of Reconcile()

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Emm.. I can't do that, for there is no UID since daemonset is not found. Delete handler should be enough.

return true
},
})
Expand Down Expand Up @@ -449,13 +450,28 @@ func isControlledByDaemonSet(p *corev1.Pod, uuid types.UID) bool {

// NewPod creates a new pod
func NewPod(ds *appsv1alpha1.DaemonSet, nodeName string) *corev1.Pod {
// firstly load the cache before lock
if pod := loadNewPodForDS(ds); pod != nil {
return pod
}

newPodForDSLock.Lock()
defer newPodForDSLock.Unlock()

// load the cache again after locked
if pod := loadNewPodForDS(ds); pod != nil {
return pod
}

newPod := &corev1.Pod{Spec: ds.Spec.Template.Spec, ObjectMeta: ds.Spec.Template.ObjectMeta}
newPod.Namespace = ds.Namespace
newPod.Spec.NodeName = nodeName
// no need to set nodeName
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since we're confident that pod for ds not exist here, plz consider using newPodForDSCache. LoadOrStore so that we don't have to maintain newPodForDSLock

Copy link
Member Author

@FillZpp FillZpp Jun 29, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, only LoadOrStore might have multiple NewPod to be create and store, for this is not only called in reconcile, but also event handler.

// newPod.Spec.NodeName = nodeName

// Added default tolerations for DaemonSet pods.
daemonsetutil.AddOrUpdateDaemonPodTolerations(&newPod.Spec)

newPodForDSCache.Store(ds.UID, &newPodForDS{generation: ds.Generation, pod: newPod})
return newPod
}

Expand Down
22 changes: 22 additions & 0 deletions pkg/controller/daemonset/daemonset_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package daemonset
import (
"fmt"
"sort"
"sync"

appspub "github.com/openkruise/kruise/apis/apps/pub"
appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1"
Expand All @@ -37,6 +38,27 @@ import (
"k8s.io/utils/integer"
)

var (
// newPodForDSCache is a cache for NewPod, it is map[ds.UID]*newPodForDS
newPodForDSCache sync.Map
newPodForDSLock sync.Mutex
)

type newPodForDS struct {
generation int64
pod *corev1.Pod
}

func loadNewPodForDS(ds *appsv1alpha1.DaemonSet) *corev1.Pod {
if val, ok := newPodForDSCache.Load(ds.UID); ok {
newPodCache := val.(*newPodForDS)
if newPodCache.generation >= ds.Generation {
return newPodCache.pod
}
}
return nil
}

// nodeInSameCondition returns true if all effective types ("Status" is true) equals;
// otherwise, returns false.
func nodeInSameCondition(old []corev1.NodeCondition, cur []corev1.NodeCondition) bool {
Expand Down