converge modules on enable/disable

Signed-off-by: Mikhail Scherba <[email protected]>

Author: miklezzzz

pkg/module_manager/module_manager.go

@@ -9,7 +9,6 @@ import (
 	"runtime/trace"
 	"strings"
 	"sync"
-	"syscall"
 	"time"
 
 	// bindings constants and binding configs
@@ -1098,7 +1097,7 @@ func mergeEnabled(enabledFlags ...*bool) bool {
 }
 
 // PushDeleteModule pushes moduleDelete task for a module into the main queue
-func (mm *ModuleManager) PushDeleteModule(moduleName string) {
+func (mm *ModuleManager) PushDeleteModuleTask(moduleName string) {
 	// check if there is already moduleDelete task in the main queue for the module
 	if queueHasPendingModuleDeleteTask(mm.dependencies.TaskQueues.GetMain(), moduleName) {
 		return
@@ -1113,10 +1112,27 @@ func (mm *ModuleManager) PushDeleteModule(moduleName string) {
 	newTask.SetProp("triggered-by", "ModuleManager")
 
 	mm.dependencies.TaskQueues.GetMain().AddLast(newTask.WithQueuedAt(time.Now()))
+
+	log.Infof("Push ConvergeModules task because %q Module was disabled", moduleName)
+	mm.PushConvergeModulesTask(moduleName, "disabled")
+}
+
+// PushConvergeModulesTask pushes ConvergeModulesTask into the main queue to update all modules on a module enable/disable event
+func (mm *ModuleManager) PushConvergeModulesTask(moduleName, moduleState string) {
+	newConvergeTask := sh_task.NewTask(task.ConvergeModules).
+		WithQueueName("main").
+		WithMetadata(task.HookMetadata{
+			EventDescription: fmt.Sprintf("ModuleManager-%s-Module", moduleState),
+			ModuleName:       moduleName,
+		}).
+		WithQueuedAt(time.Now())
+	newConvergeTask.SetProp("triggered-by", "ModuleManager")
+
+	mm.dependencies.TaskQueues.GetMain().AddLast(newConvergeTask.WithQueuedAt(time.Now()))
 }
 
-// PushRunModule pushes moduleRun task for a module into the main queue if there is no such a task for the module
-func (mm *ModuleManager) PushRunModule(moduleName string) error {
+// PushRunModuleTask pushes moduleRun task for a module into the main queue if there is no such a task for the module
+func (mm *ModuleManager) PushRunModuleTask(moduleName string) error {
 	// update module's kube config
 	err := mm.dependencies.KubeConfigManager.UpdateModuleConfig(moduleName)
 	if err != nil {
@@ -1206,8 +1222,9 @@ func (mm *ModuleManager) RegisterModule(moduleSource, modulePath string) error {
 			}
 
 			if isEnabled {
-				log.Infof("Restarting operator because %q Module was re-enabled", moduleName)
-				return syscall.Kill(1, syscall.SIGUSR2)
+				log.Infof("Push ConvergeModules task because %q Module was re-enabled", moduleName)
+				mm.PushConvergeModulesTask(moduleName, "re-enabled")
+
 			}
 			return nil
 		}
@@ -1234,7 +1251,7 @@ func (mm *ModuleManager) RegisterModule(moduleSource, modulePath string) error {
 
 		if isEnabled {
 			// enqueue module startup sequence if it is enabled
-			mm.PushRunModule(moduleName)
+			mm.PushRunModuleTask(moduleName)
 			if err != nil {
 				return err
 			}
@@ -1245,7 +1262,7 @@ func (mm *ModuleManager) RegisterModule(moduleSource, modulePath string) error {
 				EventType:  events.ModuleDisabled,
 			}
 			mm.SendModuleEvent(ev)
-			mm.PushDeleteModule(moduleName)
+			mm.PushDeleteModuleTask(moduleName)
 			// modules is disabled - update modulemanager's state
 			mm.DeleteEnabledModuleName(moduleName)
 		}
@@ -1272,8 +1289,8 @@ func (mm *ModuleManager) RegisterModule(moduleSource, modulePath string) error {
 	}
 
 	if isEnabled {
-		log.Infof("Restarting operator because %q Module was registered", moduleName)
-		return syscall.Kill(1, syscall.SIGUSR2)
+		log.Infof("Push ConvergeModules task because %q Module was enabled", moduleName)
+		mm.PushConvergeModulesTask(moduleName, "registered-and-enabled")
 	}
 	return nil
 }