Fix cancel callback may be called twice (apache#2557)

chenBright · Mar 12, 2024 · 17a200c · 17a200c
1 parent e289c76
commit 17a200c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/brpc/controller.cpp b/src/brpc/controller.cpp
@@ -552,15 +552,15 @@ void Controller::NotifyOnCancel(google::protobuf::Closure* callback) {
         LOG(FATAL) << "NotifyCancel a single call more than once!";
         return;
     }
-    if (bthread_id_create(&_oncancel_id, callback, RunOnCancel) != 0) {
-        PLOG(FATAL) << "Fail to create bthread_id";
-        return;
-    }
     SocketUniquePtr sock;
     if (Socket::Address(_current_call.peer_id, &sock) != 0) {
         // Connection already broken
         return;
     }
+    if (bthread_id_create(&_oncancel_id, callback, RunOnCancel) != 0) {
+        PLOG(FATAL) << "Fail to create bthread_id";
+        return;
+    }
     sock->NotifyOnFailed(_oncancel_id);  // Always succeed
     guard.release();
 }