Refactor cron

dtaniwaki · Oct 10, 2021 · b98a623 · b98a623
1 parent a92a00a
commit b98a623
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/controllers/cron.go b/controllers/cron.go
@@ -87,7 +87,7 @@ func (c *Cron) Remove(namespacedName types.NamespacedName, patchName string) {
 	}
 }
 
-func (c *Cron) RemoveResourceEntries(namespacedName types.NamespacedName) {
+func (c *Cron) RemoveResourceEntry(namespacedName types.NamespacedName) {
 	c.lock.Lock()
 	defer c.lock.Unlock()
 
@@ -101,6 +101,18 @@ func (c *Cron) RemoveResourceEntries(namespacedName types.NamespacedName) {
 	}
 }
 
+func (c *Cron) ListResourceEntry(namespacedName types.NamespacedName) ResourceEntry {
+	c.lock.Lock()
+	defer c.lock.Unlock()
+
+	resourceName := getResourceEntryName(namespacedName)
+	resourceEntry, ok := c.resourceEntries[resourceName]
+	if ok && resourceEntry != nil {
+		return resourceEntry
+	}
+	return ResourceEntry{}
+}
+
 func getResourceEntryName(namespacedName types.NamespacedName) string {
 	return fmt.Sprintf("%s/%s", namespacedName.Namespace, namespacedName.Name)
 }
diff --git a/controllers/croncontext.go b/controllers/croncontext.go
@@ -50,7 +50,7 @@ func (cronctx *CronContext) run(ctx context.Context) error {
 	if err != nil {
 		if errors.IsNotFound(err) {
 			// Remove the lost cron.
-			cronctx.reconciler.Cron.RemoveResourceEntries(cronhpa.ToNamespacedName())
+			cronctx.reconciler.Cron.RemoveResourceEntry(cronhpa.ToNamespacedName())
 			return nil
 		}
 		return err

diff --git a/controllers/cronhpa.go b/controllers/cronhpa.go
@@ -53,7 +53,7 @@ const MAX_SCHEDULE_TRY = 1000000
 func (cronhpa *CronHorizontalPodAutoscaler) UpdateSchedules(ctx context.Context, reconciler *CronHorizontalPodAutoscalerReconciler) error {
 	logger := log.FromContext(ctx)
 	logger.Info(fmt.Sprintf("Update schedules of %s in %s", cronhpa.Name, cronhpa.Namespace))
-	reconciler.Cron.RemoveResourceEntries(cronhpa.ToNamespacedName())
+	reconciler.Cron.RemoveResourceEntry(cronhpa.ToNamespacedName())
 	entryNames := make([]string, 0)
 	for _, scheduledPatch := range cronhpa.Spec.ScheduledPatches {
 		entryNames = append(entryNames, scheduledPatch.Name)
@@ -77,7 +77,7 @@ func (cronhpa *CronHorizontalPodAutoscaler) UpdateSchedules(ctx context.Context,
 }
 
 func (cronhpa *CronHorizontalPodAutoscaler) ClearSchedules(ctx context.Context, reconciler *CronHorizontalPodAutoscalerReconciler) error {
-	reconciler.Cron.RemoveResourceEntries(cronhpa.ToNamespacedName())
+	reconciler.Cron.RemoveResourceEntry(cronhpa.ToNamespacedName())
 	msg := "Unscheduled"
 	reconciler.Recorder.Event((*cronhpav1alpha1.CronHorizontalPodAutoscaler)(cronhpa), corev1.EventTypeNormal, CronHPAEventUnscheduled, msg)
 	return nil