ARCHIVE/clio
1
0
Fork 0
mirror of https://github.com/XRPLF/clio.git synced 2026-08-21 20:50:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Introduce retry for transient errors from DB (#3167)

Browse Source
This commit is contained in:
Alex Kremer
2026-08-10 14:39:15 +01:00
committed by GitHub
parent f490117cfb
commit dbdbe4ea1f
27 changed files with 665 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
tests/unit/data/cassandra/SettingsProviderTests.cpp
View File

@@ -47,7 +47,11 @@ getParseSettingsConfig(boost::json::value val)
{"database.cassandra.write_batch_size", ConfigValue{ConfigType::Integer}.defaultValue(20)},
{"database.cassandra.connect_timeout", ConfigValue{ConfigType::Integer}.optional()},
{"database.cassandra.certfile", ConfigValue{ConfigType::String}.optional()},
{"database.cassandra.request_timeout", ConfigValue{ConfigType::Integer}.defaultValue(0)},
{"database.cassandra.initial_request_retry_delay",
ConfigValue{ConfigType::Double}.defaultValue(0.5)},
{"database.cassandra.max_request_retry_delay",
ConfigValue{ConfigType::Double}.defaultValue(5.0)},
{"database.cassandra.request_timeout", ConfigValue{ConfigType::Double}.optional()},
{"database.cassandra.secure_connect_bundle", ConfigValue{ConfigType::String}.optional()},
{"database.cassandra.username", ConfigValue{ConfigType::String}.optional()},
{"database.cassandra.password", ConfigValue{ConfigType::String}.optional()},
@@ -163,3 +167,72 @@ TEST_F(SettingsProviderTest, CertificateConfig)
auto const settings = provider.getSettings();
EXPECT_EQ(settings.certificate, "certificateData");
}
TEST_F(SettingsProviderTest, RequestTimeoutAcceptsFractionalSeconds)
{
auto const cfg = getParseSettingsConfig(
boost::json::parse(
R"JSON({"database.cassandra.contact_points": "127.0.0.1",
"database.cassandra.request_timeout": 2.5})JSON"
)
);
SettingsProvider const provider{cfg.getObject("database.cassandra")};
EXPECT_EQ(provider.getSettings().requestTimeout, std::chrono::milliseconds{2500});
}
TEST_F(SettingsProviderTest, RequestTimeoutStillAcceptsWholeSeconds)
{
// a JSON integer must still be accepted
auto const cfg = getParseSettingsConfig(
boost::json::parse(
R"JSON({"database.cassandra.contact_points": "127.0.0.1",
"database.cassandra.request_timeout": 3})JSON"
)
);
SettingsProvider const provider{cfg.getObject("database.cassandra")};
EXPECT_EQ(provider.getSettings().requestTimeout, std::chrono::milliseconds{3000});
}
TEST_F(SettingsProviderTest, RetryDelaysDefaults)
{
auto const cfg = getParseSettingsConfig(
boost::json::parse(R"JSON({"database.cassandra.contact_points": "127.0.0.1"})JSON")
);
SettingsProvider const provider{cfg.getObject("database.cassandra")};
EXPECT_EQ(provider.getInitialRetryDelay(), std::chrono::milliseconds{500});
EXPECT_EQ(provider.getMaxRetryDelay(), std::chrono::milliseconds{5000});
}
TEST_F(SettingsProviderTest, RetryDelaysAreIndependentOfRequestTimeout)
{
auto const cfg = getParseSettingsConfig(
boost::json::parse(
R"JSON({"database.cassandra.contact_points": "127.0.0.1",
"database.cassandra.request_timeout": 2.5,
"database.cassandra.initial_request_retry_delay": 0.25,
"database.cassandra.max_request_retry_delay": 1.5})JSON"
)
);
SettingsProvider const provider{cfg.getObject("database.cassandra")};
EXPECT_EQ(provider.getSettings().requestTimeout, std::chrono::milliseconds{2500});
EXPECT_EQ(provider.getInitialRetryDelay(), std::chrono::milliseconds{250});
EXPECT_EQ(provider.getMaxRetryDelay(), std::chrono::milliseconds{1500});
}
TEST_F(SettingsProviderTest, EqualRetryDelaysDisableBackoff)
{
auto const cfg = getParseSettingsConfig(
boost::json::parse(
R"JSON({"database.cassandra.contact_points": "127.0.0.1",
"database.cassandra.initial_request_retry_delay": 0.5,
"database.cassandra.max_request_retry_delay": 0.5})JSON"
)
);
SettingsProvider const provider{cfg.getObject("database.cassandra")};
EXPECT_EQ(provider.getInitialRetryDelay(), provider.getMaxRetryDelay());
}