reload a module only if it's already exists

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

Author: miklezzzz

pkg/module_manager/models/modules/events/events.go

@@ -15,7 +15,4 @@ const (
 type ModuleEvent struct {
 	ModuleName string
 	EventType  ModuleEventType
-
-	// an option for registering a module without reloading the operator
-	RegisterWithoutReload bool
 }

pkg/module_manager/module_manager.go

@@ -1096,7 +1096,7 @@ func mergeEnabled(enabledFlags ...*bool) bool {
 	return result
 }
 
-// PushDeleteModule push moduleDelete task for a module into the main queue
+// PushDeleteModule pushes moduleDelete task for a module into the main queue
 func (mm *ModuleManager) PushDeleteModule(moduleName string) {
 	// check if there is already moduleDelete task in the main queue for the module
 	if queueHasPendingModuleDeleteTask(mm.dependencies.TaskQueues.GetMain(), moduleName) {
@@ -1153,7 +1153,8 @@ func (mm *ModuleManager) AreModulesInited() bool {
 	return mm.modules.IsInited()
 }
 
-// RegisterModule disables and deregisters modules' hooks, and reloads module config
+// RegisterModule checks if a module already exists and reapplies(reloads) its configuration.
+// If it's a new module - converges all modules
 func (mm *ModuleManager) RegisterModule(moduleSource, modulePath string) error {
 	if !mm.modules.IsInited() {
 		return moduleset.ErrNotInited
@@ -1169,7 +1170,7 @@ func (mm *ModuleManager) RegisterModule(moduleSource, modulePath string) error {
 		return fmt.Errorf("no module loader set")
 	}
 
-	// get basic module
+	// get basic module definition
 	basicModule, err := mm.moduleLoader.LoadModule(moduleSource, modulePath)
 	if err != nil {
 		return fmt.Errorf("failed to get basic module's definition: %w", err)
@@ -1187,7 +1188,7 @@ func (mm *ModuleManager) RegisterModule(moduleSource, modulePath string) error {
 
 	basicModule.WithDependencies(dep)
 
-	// check if module is already in moduleset
+	// check if module already exists
 	if mm.modules.Has(moduleName) {
 		// if module is disabled in module manager
 		if !mm.IsModuleEnabled(moduleName) {
@@ -1204,22 +1205,34 @@ func (mm *ModuleManager) RegisterModule(moduleSource, modulePath string) error {
 			}
 
 			if isEnabled {
-				// update modulemanager's state
+				// add module to the enabled modules list
 				mm.AddEnabledModuleName(moduleName)
-				mm.AddEnabledModuleByConfigName(moduleName)
-				// enqueue module startup sequence if it is enabled
-				err := mm.PushRunModule(moduleName)
-				if err != nil {
-					return err
+				for _, enabledModule := range mm.enabledModules.GetAll() {
+					ev := events.ModuleEvent{
+						ModuleName: enabledModule,
+						EventType:  events.ModuleEnabled,
+					}
+					mm.SendModuleEvent(ev)
+					// Run OnStartup and Kubernetes.Synchronization hooks
+					// on application startup or if module become enabled.
+					doModuleStartup := false
+					if moduleName == enabledModule {
+						doModuleStartup = true
+					}
+					newTask := sh_task.NewTask(task.ModuleRun).
+						WithQueueName("main").
+						WithMetadata(task.HookMetadata{
+							EventDescription: "ModuleManager-Converge-All-Modules",
+							ModuleName:       moduleName,
+							DoModuleStartup:  doModuleStartup,
+							IsReloadAll:      true,
+						})
+					newTask.SetProp("triggered-by", "ModuleManager")
+					mm.dependencies.TaskQueues.GetMain().AddLast(newTask.WithQueuedAt(time.Now()))
 				}
-				mm.SendModuleEvent(events.ModuleEvent{
-					ModuleName: moduleName,
-					EventType:  events.ModuleEnabled,
-				})
 			}
 			return nil
 		}
-
 		// module is enabled, disable its hooks
 		mm.DisableModuleHooks(moduleName)
 
@@ -1249,27 +1262,64 @@ func (mm *ModuleManager) RegisterModule(moduleSource, modulePath string) error {
 			}
 		} else {
 			// modules is disabled - update modulemanager's state
-			mm.DeleteEnabledModuleName(moduleName)
-			// enqueue module delete sequence
-			mm.PushDeleteModule(moduleName)
-			// throw disable module event
-			mm.SendModuleEvent(events.ModuleEvent{
+			ev := events.ModuleEvent{
 				ModuleName: moduleName,
 				EventType:  events.ModuleDisabled,
-			})
+			}
+			mm.SendModuleEvent(ev)
+			mm.PushDeleteModule(moduleName)
+			// modules is disabled - update modulemanager's state
+			mm.DeleteEnabledModuleName(moduleName)
 		}
 		return nil
 	}
 
 	// module doesn't exist
 	mm.modules.Add(basicModule)
 
-	// a new module requires to be registered without reloading the operator
+	// a new module requires to be registered
 	mm.SendModuleEvent(events.ModuleEvent{
-		ModuleName:            moduleName,
-		EventType:             events.ModuleRegistered,
-		RegisterWithoutReload: true,
+		ModuleName: moduleName,
+		EventType:  events.ModuleRegistered,
 	})
+
+	// if module is disabled in the module kube config - exit
+	if !mm.dependencies.KubeConfigManager.IsModuleEnabled(moduleName) {
+		return nil
+	}
+	// if the module kube config has enabled true, check enable script
+	isEnabled, err := basicModule.RunEnabledScript(mm.TempDir, mm.GetEnabledModuleNames(), map[string]string{})
+	if err != nil {
+		return err
+	}
+
+	if isEnabled {
+		// add module to the enabled modules list
+		mm.AddEnabledModuleName(moduleName)
+		for _, enabledModule := range mm.enabledModules.GetAll() {
+			ev := events.ModuleEvent{
+				ModuleName: enabledModule,
+				EventType:  events.ModuleEnabled,
+			}
+			mm.SendModuleEvent(ev)
+			// Run OnStartup and Kubernetes.Synchronization hooks
+			// on application startup or if module become enabled.
+			doModuleStartup := false
+			if moduleName == enabledModule {
+				doModuleStartup = true
+			}
+			newTask := sh_task.NewTask(task.ModuleRun).
+				WithQueueName("main").
+				WithMetadata(task.HookMetadata{
+					EventDescription: "ModuleManager-Converge-All-Modules",
+					ModuleName:       moduleName,
+					DoModuleStartup:  doModuleStartup,
+					IsReloadAll:      true,
+				})
+			newTask.SetProp("triggered-by", "ModuleManager")
+			mm.dependencies.TaskQueues.GetMain().AddLast(newTask.WithQueuedAt(time.Now()))
+		}
+	}
 	return nil
 }