Merge pull request alibaba#535 from Coldwings/fix-rpc-shutdown-test

Fix on epoll-ng when testing in RpcTest shutdown
Coldwings · Aug 9, 2024 · e1502a4 · e1502a4
2 parents 33e3251 + 166b978
commit e1502a4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/io/epoll-ng.cpp b/io/epoll-ng.cpp
@@ -299,6 +299,8 @@ class EventEngineEPollNG : public MasterEventEngine,
             return 0;  // Event arrived
         }
         rm_interest(event);
+        // fire events in case of event during notify
+        wait_and_fire_events(0);
         if (ret == 0) {
             errno = ETIMEDOUT;
             return -1;

diff --git a/rpc/test/test.cpp b/rpc/test/test.cpp
@@ -396,12 +396,10 @@ TEST_F(RpcTest, shutdown) {
     ASSERT_NE(nullptr, stub);
     DEFER(pool->put_stub(ep, true));
 
-    photon::thread_create11([&]{
+    auto stopper = photon::thread_enable_join(photon::thread_create11([&]{
         photon::thread_sleep(1);
         sk->shutdown();
-        delete sk;
-        sk = nullptr;
-    });
+    }));
 
     auto start = std::chrono::steady_clock::now();
     while (true) {
@@ -415,6 +413,8 @@ TEST_F(RpcTest, shutdown) {
     auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count();
     GTEST_ASSERT_GT(duration, 900);
     GTEST_ASSERT_LT(duration, 1100);
+
+    photon::thread_join(stopper);
 }
 
 TEST_F(RpcTest, passive_shutdown) {