BUG/MINOR: reloads: trigger callback in force reload even when next reload exists

Author: mjuraga

haproxy/reload_agent.go

@@ -292,7 +292,9 @@ func (ra *ReloadAgent) ReloadWithCallback(callback func()) string {
 		next = ra.cache.newReloadWithCallback(callback)
 		log.WithFields(map[string]interface{}{logFieldReloadID: next}, log.DebugLevel, "Scheduling a new reload...")
 	}
-
+	ra.cache.mu.Lock()
+	ra.cache.callbacks[next] = callback
+	ra.cache.mu.Unlock()
 	return next
 }
 
@@ -304,6 +306,7 @@ func (ra *ReloadAgent) ForceReloadWithCallback(callback func()) error {
 		if err != nil {
 			return NewReloadError(fmt.Sprintf("Reload failed: %v, %v", err, r))
 		}
+		callback()
 		return nil
 	}
 
@@ -338,7 +341,9 @@ func (rc *reloadCache) newReload() string {
 
 func (rc *reloadCache) newReloadWithCallback(callback func()) string {
 	next := rc.newReload()
+	rc.mu.Lock()
 	rc.callbacks[next] = callback
+	rc.mu.Unlock()
 	return next
 }