changes for racmaint in occ

paypal · Sep 24, 2024 · 4000eab · 4000eab
1 parent d8670b9
commit 4000eab
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/lib/racmaint.go b/lib/racmaint.go
@@ -61,7 +61,8 @@ func InitRacMaint(cmdLineModuleName string) {
 	interval := GetConfig().RacMaintReloadInterval
 	if interval > 0 {
 		for i := 0; i < GetConfig().NumOfShards; i++ {
-			go racMaintMain(i, interval, cmdLineModuleName)
+			shardIndex := i //Address the behavior called variable capture.
+			go racMaintMain(shardIndex, interval, cmdLineModuleName)
 		}
 	}
 }

diff --git a/lib/workerpool.go b/lib/workerpool.go
@@ -716,7 +716,7 @@ func (pool *WorkerPool) RacMaint(racReq racAct) {
 			}
 
 			if logger.GetLogger().V(logger.Verbose) {
-				logger.GetLogger().Log(logger.Verbose, "Rac maint activating, worker", i, pool.workers[i].pid, "exittime=", pool.workers[i].exitTime, now, window, pool.currentSize)
+				logger.GetLogger().Log(logger.Verbose, "Rac maint activating, worker", i, pool.workers[i].pid, "exittime=", pool.workers[i].exitTime, now, window, pool.currentSize, "rac.req timestamp=", racReq.tm)
 			}
 			//Trigger individual event for worker
 			evt := cal.NewCalEvent("RAC_ID", fmt.Sprintf("%d", racReq.instID), cal.TransOK, "")

diff --git a/tests/unittest/rac_maint_async/main_test.go b/tests/unittest/rac_maint_async/main_test.go
@@ -114,5 +114,9 @@ func TestRacMaintWithRandomStatusChangeInAsync(t *testing.T) {
 		t.Fatalf("ram maint status 'U' should not skip with invalid-status event")
 	}
 
+	if testutil.RegexCountFile("RAC_ID", "cal.log") < 20 {
+		t.Fatalf("ram maint should trigger for all workers once.")
+	}
+
 	logger.GetLogger().Log(logger.Debug, "TestRacMaintWithRandomStatusChangeInAsync done  -------------------------------------------------------------")
 }