🐛 Fixing deadlock issue with the scheduler shutdown and writing state…

… to S3
Financial-Times · Jun 1, 2017 · 3a88a1d · 3a88a1d
1 parent 02907d2
commit 3a88a1d
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/scheduler/scheduler.go b/scheduler/scheduler.go
@@ -99,9 +99,6 @@ func (s *defaultScheduler) DeleteCycle(cycleID string) error {
 }
 
 func (s *defaultScheduler) saveCycleMetadata() {
-	s.cycleLock.RLock()
-	defer s.cycleLock.RUnlock()
-
 	log.Info("Saving cycle metadata to S3.")
 
 	for _, cycle := range s.cycles {
@@ -160,7 +157,12 @@ func (s *defaultScheduler) Start() error {
 		time.Sleep(startInterval)
 	}
 
-	s.checkpointHandler.start(s.saveCycleMetadata)
+	s.checkpointHandler.start(func() {
+		s.cycleLock.RLock()
+		defer s.cycleLock.RUnlock()
+
+		s.saveCycleMetadata()
+	})
 
 	return nil
 }
@@ -246,6 +248,7 @@ func (s *defaultScheduler) toggleHandler(toggleValue string, requestType int) {
 				return
 			}
 		}
+
 		if requestType == automatic {
 			s.state.setState(autoDisabled)
 		} else {