feat all: drop phdr-cache experiment, enable it by default

alexiprof · Nov 16, 2023 · 88b942c · 88b942c
1 parent 00d16a4
commit 88b942c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 15 deletions.
diff --git a/core/include/userver/utils/impl/userver_experiments.hpp b/core/include/userver/utils/impl/userver_experiments.hpp
@@ -62,8 +62,6 @@ class UserverExperimentsScope final {
 // TODO move to userver/mongo once the issues with linker are resolved.
 extern UserverExperiment kRedisClusterAutoTopologyExperiment;
 
-extern UserverExperiment kPhdrCacheExperiment;
-
 }  // namespace utils::impl
 
 USERVER_NAMESPACE_END
diff --git a/core/src/engine/task/exception_hacks.cpp b/core/src/engine/task/exception_hacks.cpp
@@ -151,20 +151,20 @@ std::atomic<PhdrCacheStorage*> phdr_cache_ptr{nullptr};
 class PhdrCache final {
  public:
   void Initialize() {
-    if (!utils::impl::kPhdrCacheExperiment.IsEnabled()) {
+    if (phdr_cache_ptr.load() != nullptr) {
       return;
     }
     LOG_INFO() << "Initializing phdr cache";
 
+    cache_.clear();
     GetOriginalDlIteratePhdr()(
         [](dl_phdr_info* info, size_t /* size */, void* data) {
           reinterpret_cast<PhdrCacheStorage*>(data)->push_back(*info);
           return 0;
         },
         &cache_);
 
-    [[maybe_unused]] const auto* old_cache = phdr_cache_ptr.exchange(&cache_);
-    UASSERT(!old_cache);
+    phdr_cache_ptr.exchange(&cache_);
 
     LOG_INFO() << "Initialized phdr cache for " << cache_.size() << " objects";
   }

diff --git a/core/src/utils/impl/userver_experiments.cpp b/core/src/utils/impl/userver_experiments.cpp
@@ -99,8 +99,6 @@ void UserverExperimentsScope::EnableOnly(
 UserverExperiment kRedisClusterAutoTopologyExperiment{
     "redis-cluster-autotopology"};
 
-UserverExperiment kPhdrCacheExperiment{"phdr-cache"};
-
 }  // namespace utils::impl
 
 USERVER_NAMESPACE_END
diff --git a/core/testing/src/utest/gtest_hooks.cpp b/core/testing/src/utest/gtest_hooks.cpp
@@ -45,14 +45,7 @@ void SetLogLevel(logging::Level log_level) {
   logging::SetDefaultLoggerLevel(log_level);
 }
 
-void InitPhdrCache() {
-  static USERVER_NAMESPACE::utils::impl::UserverExperimentsScope
-      phdr_cache_scope{};
-  phdr_cache_scope.Set(USERVER_NAMESPACE::utils::impl::kPhdrCacheExperiment,
-                       true);
-
-  USERVER_NAMESPACE::engine::impl::InitPhdrCache();
-}
+void InitPhdrCache() { USERVER_NAMESPACE::engine::impl::InitPhdrCache(); }
 
 void TeardownPhdrCache() {
   USERVER_NAMESPACE::engine::impl::TeardownPhdrCacheAndEnableDynamicLoading();