Merge pull request #404 from SOF3/diff-writer-reelect

fix(diff): always resyncMonitors the first time after acquiring watch leader lease

.github/workflows/build.yml

@@ -206,7 +206,7 @@ jobs:
           </html>
           EOF
       - name: Upload pages artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
           path: output
 
@@ -218,7 +218,7 @@ jobs:
     concurrency:
       group: gh-pages
     steps:
-      - uses: actions/deploy-pages@v2
+      - uses: actions/deploy-pages@v4
         id: deployment
 
   publish-image:

.github/workflows/ci.yml

@@ -50,6 +50,6 @@ jobs:
     runs-on: [ubuntu-20.04]
     steps:
       - uses: actions/checkout@v3
-      - uses: crate-ci/typos@master
+      - uses: crate-ci/typos@v1.29.5
         with:
           config: hack/typos.toml

pkg/diff/controller/controller.go

@@ -306,6 +306,17 @@ func (ctrl *controller) resyncMonitorsLoop(ctx context.Context) {
 	go writeElector.RunLeaderMetricLoop(ctx)
 
 	for {
+		err := retry.OnError(retry.DefaultBackoff, func(_ error) bool { return true }, func() error {
+			err := ctrl.resyncMonitors(ctx)
+			if err != nil {
+				logger.WithError(err).Warn("resync monitors")
+			}
+			return err
+		})
+		if err != nil {
+			logger.WithError(err).Error("resync monitors failed")
+		}
+
 		stopped := false
 
 		select {
@@ -317,17 +328,6 @@ func (ctrl *controller) resyncMonitorsLoop(ctx context.Context) {
 		if stopped {
 			break
 		}
-
-		err := retry.OnError(retry.DefaultBackoff, func(_ error) bool { return true }, func() error {
-			err := ctrl.resyncMonitors(ctx)
-			if err != nil {
-				logger.WithError(err).Warn("resync monitors")
-			}
-			return err
-		})
-		if err != nil {
-			logger.WithError(err).Error("resync monitors failed")
-		}
 	}
 
 	ctrl.monitorsLock.Lock()