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

Redis: return proper error if connection fails

Browse source
This commit is contained in:
Tim Wojtulewicz 2025-05-22 16:38:59 -07:00
parent d929392a76
commit 0fb4548ff0
4 changed files with 38 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -634,7 +634,7 @@ void Redis::HandleInfoResult(redisReply* reply) {
} }
void Redis::OnConnect(int status) { void Redis::OnConnect(int status) {
DBG_LOG(DBG_STORAGE, "Redis backend: connection event"); DBG_LOG(DBG_STORAGE, "Redis backend: connection event, status=%d", status);
--active_ops; --active_ops;
connected = false; connected = false;
@ -644,7 +644,7 @@ void Redis::OnConnect(int status) {
if ( status == REDIS_ERR ) { if ( status == REDIS_ERR ) {
// TODO: do something with the error? // TODO: do something with the error?
DBG_LOG(DBG_STORAGE, "INFO command failed: %s", async_ctx->errstr); DBG_LOG(DBG_STORAGE, "INFO command failed: %s err=%d", async_ctx->errstr, async_ctx->err);
CompleteCallback(open_cb, CompleteCallback(open_cb,
{ReturnCode::OPERATION_FAILED, {ReturnCode::OPERATION_FAILED,
util::fmt("INFO command failed to retrieve server info: %s", async_ctx->errstr)}); util::fmt("INFO command failed to retrieve server info: %s", async_ctx->errstr)});
@ -653,12 +653,17 @@ void Redis::OnConnect(int status) {
++active_ops; ++active_ops;
} }
else {
DBG_LOG(DBG_STORAGE, "Redis backend: connection failed: %s err=%d", async_ctx->errstr, async_ctx->err);
CompleteCallback(open_cb,
{ReturnCode::CONNECTION_FAILED, util::fmt("Connection failed: %s", async_ctx->errstr)});
}
// TODO: we could attempt to reconnect here // TODO: we could attempt to reconnect here
} }
void Redis::OnDisconnect(int status) { void Redis::OnDisconnect(int status) {
DBG_LOG(DBG_STORAGE, "Redis backend: disconnection event"); DBG_LOG(DBG_STORAGE, "Redis backend: disconnection event, status=%d", status);
connected = false; connected = false;
if ( status == REDIS_ERR ) { if ( status == REDIS_ERR ) {

1
testing/btest/Baseline/scripts.base.frameworks.storage.redis-error-handling/.stderr Normal file
View file

@ -0,0 +1 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.

2
testing/btest/Baseline/scripts.base.frameworks.storage.redis-error-handling/out Normal file
View file

@ -0,0 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
Failed to connect

27
testing/btest/scripts/base/frameworks/storage/redis-error-handling.zeek Normal file
View file

@ -0,0 +1,27 @@
# @TEST-DOC: Tests various error handling scenarios for the storage framework
# @TEST-REQUIRES: have-redis
# @TEST-PORT: REDIS_PORT
# @TEST-EXEC: zeek -b %INPUT > out
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderr
@load base/frameworks/storage/sync
@load base/frameworks/reporter
@load policy/frameworks/storage/backend/redis
event zeek_init() {
# Test failing to connect to a server
local opts : Storage::BackendOptions;
opts$redis = [ $server_host="127.0.0.1", $server_port=to_port(getenv(
"REDIS_PORT")), $key_prefix="testing" ];
local res = Storage::Sync::open_backend(Storage::STORAGE_BACKEND_REDIS, opts, string, string);
# macOS says this is a timeout, but linux says it's a connection refused. The
# error string in the record contains the full reason, so don't print out the full
# record in the interest of test determinism.
if ( res$code == Storage::CONNECTION_FAILED )
print "Failed to connect";
}