exlcude TTL1 trap when set up TTL zero for trap loop

daiwei1983 · facebook-github-bot · commit 50b2a7276c36 · 2025-01-30T08:38:49.000-08:00
Summary: Currently AgentVoqSwitchLineRateTest.dramBlocked is failing during warmboot because both TTL_0 and TTL_1 trap are programmed. They correspond to the same underlying sai object programming the same rx reason https://fburl.com/code/nsewyupj, which could lead to conflict or confusion during warmboot when agent attempt to load sai objects and restore switch state. This diff resolves this issue by excluding TTL1 trap when calling setTTLZeroCpuConfig() Reviewed By: jasmeetbagga Differential Revision: D68798218 Privacy Context Container: L1125642 fbshipit-source-id: 557310efc9d7bee273f4ad7b2cb78e4c426a2251
diff --git a/fboss/agent/test/utils/CoppTestUtils.cpp b/fboss/agent/test/utils/CoppTestUtils.cpp
@@ -685,7 +685,7 @@ void setTTLZeroCpuConfig(
     // don't configure if not supported
     return;
   }
-
+  excludeTTL1TrapConfig(config);
   std::vector<cfg::PacketRxReasonToQueue> rxReasons;
   bool addTtlRxReason = true;
   if (config.cpuTrafficPolicy().has_value() &&

Original file line number	Diff line number	Diff line change
`@@ -685,7 +685,7 @@ void setTTLZeroCpuConfig(`
`685`	`685`	`// don't configure if not supported`
`686`	`686`	`return;`
`687`	`687`	`}`
`688`		`-`
	`688`	`+ excludeTTL1TrapConfig(config);`
`689`	`689`	`std::vector<cfg::PacketRxReasonToQueue> rxReasons;`
`690`	`690`	`bool addTtlRxReason = true;`
`691`	`691`	`if (config.cpuTrafficPolicy().has_value() &&`