Merge pull request #4159 from LiilyZhang/zhangl/Issue4158

Issue #4158 - Bug: Intermittent panic on agent startup
open-horizon · Oct 10, 2024 · a2f6c4b · a2f6c4b
2 parents e988450 + ac06413
commit a2f6c4b
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/agreement/agreement.go b/agreement/agreement.go
@@ -352,7 +352,9 @@ func (w *AgreementWorker) reconcileNodePolicy() int {
 		return 60
 	}
 
-	w.checkNodePolicyChanges()
+	if w.limitedRetryEC != nil {
+		w.checkNodePolicyChanges()
+	}
 
 	return 60
 }
@@ -501,7 +503,9 @@ func (w *AgreementWorker) CommandHandler(command worker.Command) bool {
 		w.checkNodeChanges()
 
 	case *NodePolicyChangeCommand:
-		w.checkNodePolicyChanges()
+		if w.limitedRetryEC != nil {
+			w.checkNodePolicyChanges()
+		}
 
 	case *NodeSvcConfigStateChangeCommand:
 		w.checkServiceConfigStateChanges()