Fix data race

Signed-off-by: chandankumar4 <[email protected]>
numaproj · Jun 20, 2024 · f23d141 · f23d141
1 parent a61cdfd
commit f23d141
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/internal/controller/config/config.go b/internal/controller/config/config.go
@@ -75,6 +75,9 @@ func (cm *ConfigManager) RemoveControllerDefinitionConfig(config NumaflowControl
 }
 
 func (cm *ConfigManager) GetControllerDefinitionsConfig() map[string]string {
+	cm.lock.Lock()
+	defer cm.lock.Unlock()
+
 	return cm.rolloutConfig
 }
 

diff --git a/internal/util/kubernetes/config_watcher_test.go b/internal/util/kubernetes/config_watcher_test.go
@@ -22,7 +22,7 @@ func Test_watchConfigMaps(t *testing.T) {
 
 	clientSet := fake.NewSimpleClientset()
 	go watchConfigMaps(ctx, clientSet, "default")
-	time.Sleep(20 * time.Second)
+	time.Sleep(10 * time.Second)
 
 	data, err := os.ReadFile("../../../tests/config/controller-definitions-config.yaml")
 	assert.NoError(t, err)
@@ -45,8 +45,7 @@ func Test_watchConfigMaps(t *testing.T) {
 	assert.NoError(t, err)
 
 	// Wait for the controller to process the ConfigMap
-	time.Sleep(10 * time.Second)
-
+	time.Sleep(5 * time.Second)
 	// Validate the controller definition config is set correctly
 	definition := config.GetConfigManagerInstance().GetControllerDefinitionsConfig()
 	assert.Len(t, definition, 2)
@@ -56,8 +55,8 @@ func Test_watchConfigMaps(t *testing.T) {
 	assert.NoError(t, err)
 
 	// Wait for the controller to process the ConfigMap
-	time.Sleep(10 * time.Second)
-
+	time.Sleep(5 * time.Second)
+	// Validate the controller definition config is updated correctly
 	definition = config.GetConfigManagerInstance().GetControllerDefinitionsConfig()
 	assert.Len(t, definition, 0)
 }