fix data race in hotreload.

syself · Dec 16, 2024 · 63ed4db · 63ed4db
1 parent c2c5f60
commit 63ed4db
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 12 deletions.
diff --git a/hcloud/cloud_test.go b/hcloud/cloud_test.go
@@ -441,13 +441,13 @@ func Test_updateHcloudCredentials(t *testing.T) {
 	_, err = i.InstanceExists(context.TODO(), node)
 	require.NoError(t, err)
 
-	oldCounter := hotreload.HcloudTokenReloadCounter
+	oldCounter := hotreload.GetHcloudReloadCounter()
 	token2 := "22222ZHpPptyhJzZyHw2Pqu4g9gTqDvEceYpngPf79jNZXCeTYQ4uArypFM3nh75"
 	err = writeCredentials(secretsDir, token2)
 	require.NoError(t, err)
 	start := time.Now()
 	for {
-		if hotreload.HcloudTokenReloadCounter > oldCounter {
+		if hotreload.GetHcloudReloadCounter() > oldCounter {
 			break
 		}
 		if time.Since(start) > time.Second*3 {

diff --git a/internal/hotreload/hotreload.go b/internal/hotreload/hotreload.go
@@ -7,7 +7,6 @@ import (
 	"path/filepath"
 	"strings"
 	"sync"
-	"sync/atomic"
 
 	fsnotify "github.com/fsnotify/fsnotify"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -23,18 +22,30 @@ var (
 	oldRobotPassword string
 	oldHcloudToken   string
 
-	// RobotReloadCounter gets incremented when the credentials get reloaded.
+	// robotReloadCounter gets incremented when the credentials get reloaded.
 	// Mosty used for testing.
-	RobotReloadCounter uint64
+	robotReloadCounter uint64
 
-	// HcloudTokenReloadCounter gets incremented when the credentials get reloaded.
+	// hcloudTokenReloadCounter gets incremented when the credentials get reloaded.
 	// Mosty used for testing.
-	HcloudTokenReloadCounter uint64
+	hcloudTokenReloadCounter uint64
 
 	hcloudMutex sync.Mutex
 	robotMutex  sync.Mutex
 )
 
+func GetRobotReloadCounter() uint64 {
+	robotMutex.Lock()
+	defer robotMutex.Unlock()
+	return robotReloadCounter
+}
+
+func GetHcloudReloadCounter() uint64 {
+	hcloudMutex.Lock()
+	defer hcloudMutex.Unlock()
+	return hcloudTokenReloadCounter
+}
+
 // Watch the mounted secrets. Reload the credentials, when the files get updated. The robotClient can be nil.
 func Watch(hetznerSecretDirectory string, hcloudClient *hcloud.Client, robotClient robotclient.Client) error {
 	watcher, err := fsnotify.NewWatcher()
@@ -112,7 +123,7 @@ func loadRobotCredentials(hetznerSecretDirectory string, robotClient robotclient
 	}
 	oldRobotUser = username
 	oldRobotPassword = password
-	atomic.AddUint64(&RobotReloadCounter, 1)
+	robotReloadCounter++
 	err = robotClient.SetCredentials(username, password)
 	if err != nil {
 		return fmt.Errorf("SetCredentials: %w", err)
@@ -160,7 +171,7 @@ func loadHcloudCredentials(hetznerSecretDirectory string, hcloudClient *hcloud.C
 		return nil
 	}
 	oldHcloudToken = token
-	atomic.AddUint64(&HcloudTokenReloadCounter, 1)
+	hcloudTokenReloadCounter++
 	hcloud.WithToken(token)(hcloudClient)
 	klog.Infof("Hetzner Cloud token updated to new value: %s...", token[:5])
 	return nil

diff --git a/internal/robot/client/cache/client_test.go b/internal/robot/client/cache/client_test.go
@@ -67,13 +67,13 @@ func Test_updateRobotCredentials(t *testing.T) {
 	require.NoError(t, err)
 	require.Len(t, servers, 1)
 
-	oldCount := hotreload.RobotReloadCounter
+	oldCount := hotreload.GetRobotReloadCounter()
 	err = writeCredentials(tmp, "user2", "password2")
 	require.NoError(t, err)
 	start := time.Now()
 	for {
-		// if hotreload.RobotReloadCounter > oldCount {
-		if hotreload.RobotReloadCounter > oldCount {
+		// if hotreload.robotReloadCounter > oldCount {
+		if hotreload.GetRobotReloadCounter() > oldCount {
 			break
 		}
 		if time.Since(start) > time.Second*3 {