fix: leader election use nodepool value for lock name (#414)

Author: enoodle

cmd/scheduler/app/server.go

@@ -166,7 +166,11 @@ func Run(opt *options.ServerOption, config *restclient.Config, mux *http.ServeMu
 	// Prepare event clients.
 	broadcaster := record.NewBroadcaster()
 	broadcaster.StartRecordingToSink(&corev1.EventSinkImpl{Interface: leaderElectionClient.CoreV1().Events(lockObjectNamespace)})
-	eventRecorder := broadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: opt.SchedulerName})
+	componentName := opt.SchedulerName
+	if len(opt.NodePoolLabelValue) > 0 {
+		componentName = fmt.Sprintf("%s-%s", opt.SchedulerName, opt.NodePoolLabelValue)
+	}
+	eventRecorder := broadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: componentName})
 
 	hostname, err := os.Hostname()
 	if err != nil {
@@ -177,7 +181,7 @@ func Run(opt *options.ServerOption, config *restclient.Config, mux *http.ServeMu
 
 	rl, err := resourcelock.New(resourcelock.LeasesResourceLock,
 		lockObjectNamespace,
-		opt.SchedulerName,
+		componentName,
 		leaderElectionClient.CoreV1(),
 		leaderElectionClient.CoordinationV1(),
 		resourcelock.ResourceLockConfig{

pkg/scheduler/cache/status_updater/concurrency.go

@@ -102,7 +102,10 @@ func (su *defaultStatusUpdater) updatePodGroup(
 	} else {
 		// Move the update to the applied cache
 		su.appliedPodGroupUpdates.Store(key, updateData)
-		su.inFlightPodGroups.Delete(key)
+		_, loaded := su.inFlightPodGroups.LoadAndDelete(key)
+		if !loaded {
+			su.appliedPodGroupUpdates.Delete(key)
+		}
 	}
 }