debug: Assert policy destruction happens in the main thread

Signed-off-by: Jarno Rajahalme <jarno@isovalent.com>
cilium · Nov 21, 2024 · 7db67de · 7db67de
1 parent 9a53218
commit 7db67de
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/cilium/network_policy.cc b/cilium/network_policy.cc
@@ -47,10 +47,14 @@ class HeaderMatch : public Logger::Loggable<Logger::Id::config> {
   HeaderMatch(const NetworkPolicyMap& parent, const cilium::HeaderMatch& config)
       : name_(config.name()), value_(config.value()), match_action_(config.match_action()),
         mismatch_action_(config.mismatch_action()) {
+    ASSERT_IS_MAIN_OR_TEST_THREAD();
     if (config.value_sds_secret().length() > 0)
       secret_ = std::make_unique<SecretWatcher>(parent, config.value_sds_secret());
   }
-
+  ~HeaderMatch() {
+    ASSERT_IS_MAIN_OR_TEST_THREAD();
+  }
+
   void logRejected(Cilium::AccessLog::Entry& log_entry, absl::string_view value) const {
     log_entry.AddRejected(name_.get(), !secret_ ? value : "[redacted]");
   }

diff --git a/cilium/secret_watcher.cc b/cilium/secret_watcher.cc
@@ -32,9 +32,14 @@ void resetSDSConfigFunc() { getSDSConfig = &getCiliumSDSConfig; }
 SecretWatcher::SecretWatcher(const NetworkPolicyMap& parent, const std::string& sds_name)
     : parent_(parent), name_(sds_name),
       secret_provider_(secretProvider(parent.transportFactoryContext(), sds_name)),
-      update_secret_(readAndWatchSecret()) {}
+      update_secret_(readAndWatchSecret()) {
+  ASSERT_IS_MAIN_OR_TEST_THREAD();
+}
 
-SecretWatcher::~SecretWatcher() { delete load(); }
+SecretWatcher::~SecretWatcher() {
+  ASSERT_IS_MAIN_OR_TEST_THREAD();
+  delete load();
+}
 
 Envoy::Common::CallbackHandlePtr SecretWatcher::readAndWatchSecret() {
   THROW_IF_NOT_OK(store());