Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Redis: disconnect cleanly if INFO request fails

Browse source
This commit is contained in:
Tim Wojtulewicz 2025-05-30 07:48:43 -07:00
parent 0d18ce4e13
commit 9f12208f57
2 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/storage/backend/redis/Redis.cc
View file

@ -124,14 +124,14 @@ void redisGeneric(redisAsyncContext* ctx, void* reply, void* privdata) {
} }
/** /**
* Callback handler for ZADD commands. * Callback handler for INFO commands.
* *
* @param ctx The async context that called this callback. * @param ctx The async context that called this callback.
* @param reply The reply from the server for the command. * @param reply The reply from the server for the command.
* @param privdata A pointer to private data passed in the command. * @param privdata A pointer to private data passed in the command.
*/ */
void redisINFO(redisAsyncContext* ctx, void* reply, void* privdata) { void redisINFO(redisAsyncContext* ctx, void* reply, void* privdata) {
auto t = Tracer("generic"); auto t = Tracer("info");
auto backend = static_cast<zeek::storage::backend::redis::Redis*>(ctx->data); auto backend = static_cast<zeek::storage::backend::redis::Redis*>(ctx->data);
backend->HandleInfoResult(static_cast<redisReply*>(reply)); backend->HandleInfoResult(static_cast<redisReply*>(reply));
} }
@ -630,8 +630,13 @@ void Redis::HandleInfoResult(redisReply* reply) {
} }
} }
if ( ! connected && res.err_str.empty() ) if ( ! connected ) {
res.err_str = "INFO command did not return server version"; if ( res.err_str.empty() )
res.err_str = "INFO command did not return server version";
disconnect_reason = res.err_str;
redisAsyncDisconnect(async_ctx);
}
freeReplyObject(reply); freeReplyObject(reply);
CompleteCallback(open_cb, res); CompleteCallback(open_cb, res);
@ -678,8 +683,13 @@ void Redis::OnDisconnect(int status) {
else { else {
--active_ops; --active_ops;
EnqueueBackendLost("Client disconnected"); if ( disconnect_reason.empty() )
CompleteCallback(close_cb, {ReturnCode::SUCCESS}); EnqueueBackendLost("Client disconnected");
else
EnqueueBackendLost(util::fmt("Client disconnected: %s", disconnect_reason.c_str()));
if ( close_cb )
CompleteCallback(close_cb, {ReturnCode::SUCCESS});
} }
redisAsyncFree(async_ctx); redisAsyncFree(async_ctx);

5
src/storage/backend/redis/Redis.h
View file

@ -70,12 +70,13 @@ private:
// poll. // poll.
std::deque<redisReply*> reply_queue; std::deque<redisReply*> reply_queue;
OpenResultCallback* open_cb; OpenResultCallback* open_cb = nullptr;
ResultCallback* close_cb; ResultCallback* close_cb = nullptr;
std::mutex expire_mutex; std::mutex expire_mutex;
std::string server_addr; std::string server_addr;
std::string key_prefix; std::string key_prefix;
std::string disconnect_reason;
std::atomic<bool> connected = false; std::atomic<bool> connected = false;
std::atomic<bool> expire_running = false; std::atomic<bool> expire_running = false;