chenBright commented on code in PR #3590:
URL: https://github.com/apache/brpc/pull/3590#discussion_r4301801201
##########
src/brpc/server.cpp:
##########
@@ -1370,6 +1374,30 @@ int Server::Join() {
return 0;
}
+void Server::DestroyPreStartAllocations() {
+ if (_status == RUNNING || _status == STOPPING) {
+ // Handled by Join().
+ return;
+ }
+ if (_keytable_pool != nullptr) {
+ // Keep the TLS key valid until its pooled data has been destroyed.
+ // Deleting the key first would disable DestroyServerTLS().
+ CHECK_EQ(0, bthread_keytable_pool_destroy(_keytable_pool));
+ // Same as Join(): don't delete the pool struct. Bthreads created
+ // with attr.keytable_pool == _keytable_pool may outlive
+ // the failed start and still call return_keytable() on exit. A
+ // destroyed pool makes them delete their KeyTables directly, but the
+ // struct itself must stay valid. The leak is annotated in
+ // StartInternal() and only happens on failed starts.
+ _keytable_pool = nullptr;
+ }
+ // Delete tls_key created in StartInternal().
+ if (_tl_options.tls_key != INVALID_BTHREAD_KEY) {
+ CHECK_EQ(0, bthread_key_delete(_tl_options.tls_key));
+ _tl_options.tls_key = INVALID_BTHREAD_KEY;
+ }
Review Comment:
Some cleanup logic is duplicated between `DestroyPreStartAllocations()` and
`Server::Join()`. Could we extract it into a common helper and reuse it in both
paths?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
