Automated fix for refs/heads/openssl-atexit-wait

BUILD

@@ -571,6 +571,7 @@ grpc_cc_library(
     external_deps = [
         "absl/base:core_headers",
         "absl/log:log",
+        "absl/time:time",
     ],
     language = "c++",
     public_hdrs = GRPC_PUBLIC_HDRS,
@@ -642,6 +643,7 @@ grpc_cc_library(
     external_deps = [
         "absl/base:core_headers",
         "absl/log:log",
+        "absl/time:time",
     ],
     language = "c++",
     public_hdrs = GRPC_PUBLIC_HDRS,

src/core/lib/surface/init.cc

@@ -20,6 +20,8 @@
 
 #include "absl/base/thread_annotations.h"
 #include "absl/log/log.h"
+#include "absl/time/clock.h"
+#include "absl/time/time.h"
 
 #include <grpc/fork.h>
 #include <grpc/grpc.h>
@@ -216,3 +218,19 @@ void grpc_maybe_wait_for_async_shutdown(void) {
     g_shutting_down_cv->Wait(g_init_mu);
   }
 }
+
+bool grpc_wait_for_shutdown_with_timeout(absl::Duration timeout) {
+  GRPC_TRACE_LOG(api, INFO) << "grpc_wait_for_shutdown_with_timeout()";
+  const auto started = absl::Now();
+  gpr_once_init(&g_basic_init, do_basic_init);
+  grpc_core::MutexLock lock(g_init_mu);
+  while (g_initializations != 0) {
+    if (g_shutting_down_cv->WaitWithTimeout(g_init_mu, timeout)) {
+      LOG(ERROR) << "grpc_wait_for_shutdown_with_timeout() timed out.";
+      return false;
+    }
+  }
+  LOG(INFO) << "grpc_wait_for_shutdown_with_timeout() took "
+            << absl::Now() - started;
+  return true;
+}

src/core/lib/surface/init.h

@@ -18,8 +18,13 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_INIT_H
 #define GRPC_SRC_CORE_LIB_SURFACE_INIT_H
 
+#include "absl/time/time.h"
+
 #include <grpc/support/port_platform.h>
 
 void grpc_maybe_wait_for_async_shutdown(void);
 
+// Returns false if the timeout expired before fully shut down.
+bool grpc_wait_for_shutdown_with_timeout(absl::Duration timeout);
+
 #endif  // GRPC_SRC_CORE_LIB_SURFACE_INIT_H

src/core/tsi/ssl_transport_security.cc

@@ -21,8 +21,11 @@
 #include <limits.h>
 #include <string.h>
 
+#include <cstdlib>
+
 #include <grpc/support/port_platform.h>
 
+#include "src/core/lib/surface/init.h"
 #include "src/core/tsi/transport_security_interface.h"
 
 // TODO(jboeuf): refactor inet_ntop into a portability header.
@@ -189,6 +192,11 @@ static void verified_root_cert_free(void* /*parent*/, void* ptr,
 static void init_openssl(void) {
 #if OPENSSL_VERSION_NUMBER >= 0x10100000
   OPENSSL_init_ssl(0, nullptr);
+  // Ensure OPENSSL global clean up happens after gRPC shutdown completes.
+  // OPENSSL registers an exit handler to clean up global objects, which
+  // otherwise may happen before gRPC removes all references to OPENSSL. Below
+  // exit handler is guaranteed to run after OPENSSL's.
+  std::atexit([]() { grpc_wait_for_shutdown_with_timeout(absl::Seconds(2)); });
 #else
   SSL_library_init();
   SSL_load_error_strings();

test/core/surface/init_test.cc

@@ -29,6 +29,7 @@
 #include <grpc/grpc.h>
 
 #include "src/core/lib/event_engine/default_event_engine.h"
+#include "src/core/lib/gprpp/thd.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "test/core/test_util/test_config.h"
 
@@ -115,6 +116,40 @@ TEST(Init, Repeatedly) {
   EXPECT_FALSE(grpc_is_initialized());
 }
 
+TEST(Init, WaitForShutdownBeforeInit) {
+  EXPECT_TRUE(grpc_wait_for_shutdown_with_timeout(absl::ZeroDuration()));
+}
+
+TEST(Init, WaitForShutdownAfterShutdown) {
+  grpc_init();
+  grpc_shutdown();
+  EXPECT_TRUE(grpc_wait_for_shutdown_with_timeout(absl::ZeroDuration()));
+}
+
+TEST(Init, WaitForShutdownWithTimeout) {
+  grpc_init();
+  grpc_init();
+  grpc_shutdown();
+  grpc_core::Thread t0(
+      "init_test",
+      [](void*) {
+        EXPECT_FALSE(grpc_wait_for_shutdown_with_timeout(absl::Seconds(0.5)));
+      },
+      nullptr);
+  grpc_core::Thread t1(
+      "init_test",
+      [](void*) {
+        EXPECT_TRUE(grpc_wait_for_shutdown_with_timeout(absl::Seconds(1.5)));
+      },
+      nullptr);
+  t0.Start();
+  t1.Start();
+  absl::SleepFor(absl::Seconds(1));
+  grpc_shutdown();
+  t0.Join();
+  t1.Join();
+}
+
 TEST(Init, RepeatedlyBlocking) {
   for (int i = 0; i < 10; i++) {
     grpc_init();