policy: Change remaining main thread asserts into error logs

Signed-off-by: Jarno Rajahalme <[email protected]>
cilium · Dec 3, 2024 · 16e43f5 · 16e43f5
1 parent c52558e
commit 16e43f5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/cilium/network_policy.h b/cilium/network_policy.h
@@ -109,7 +109,12 @@ class IPAddressPair {
 
 class PolicyInstance {
 public:
-  virtual ~PolicyInstance() { ASSERT_IS_MAIN_OR_TEST_THREAD(); };
+  virtual ~PolicyInstance() {
+    if (!Thread::MainThread::isMainOrTestThread()) {
+      ENVOY_LOG_MISC(error, "PolicyInstance: Destructor executing in a worker thread, while "
+                            "only main thread should destruct xDS resources");
+    }
+  };
 
   virtual bool allowed(bool ingress, uint32_t remote_id, uint16_t port,
                        Envoy::Http::RequestHeaderMap& headers,

diff --git a/cilium/secret_watcher.cc b/cilium/secret_watcher.cc
@@ -35,7 +35,10 @@ SecretWatcher::SecretWatcher(const NetworkPolicyMap& parent, const std::string&
       update_secret_(readAndWatchSecret()) {}
 
 SecretWatcher::~SecretWatcher() {
-  ASSERT_IS_MAIN_OR_TEST_THREAD();
+  if (!Thread::MainThread::isMainOrTestThread()) {
+    ENVOY_LOG(error, "SecretWatcher: Destructor executing in a worker thread, while "
+                     "only main thread should destruct xDS resources");
+  }
   delete load();
 }