Merge pull request #526 from lihuiba/pr_0.7_main

manual pr 0.7 to main
alibaba · Jul 16, 2024 · ac06081 · ac06081
2 parents 7c59780 + 78e8e1e
commit ac06081
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/io/iouring-wrapper.cpp b/io/iouring-wrapper.cpp
@@ -112,7 +112,7 @@ class iouringEngine : public MasterEventEngine, public CascadingEventEngine, pub
         if (probe == nullptr) {
             LOG_ERROR_RETURN(0, -1, "iouring: failed to get probe");
         }
-        DEFER(free(probe));
+        DEFER(io_uring_free_probe(probe));
         if (!io_uring_opcode_supported(probe, IORING_OP_PROVIDE_BUFFERS) ||
             !io_uring_opcode_supported(probe, IORING_OP_ASYNC_CANCEL)) {
             LOG_ERROR_RETURN(0, -1, "iouring: some opcodes are not supported");

diff --git a/rpc/test/test.cpp b/rpc/test/test.cpp
@@ -481,7 +481,8 @@ TEST_F(RpcTest, passive_shutdown) {
 
     // The passive shutdown took 3 seconds, until client closed the connection
     GTEST_ASSERT_GT(duration, 2900);
-    GTEST_ASSERT_LT(duration, 3200);
+    // Since GH CI is slow, we allow 3.5 secs
+    GTEST_ASSERT_LT(duration, 3500);
 }
 
 int main(int argc, char** arg)