Skip to content

Update cluster config #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
githubzilla merged 5 commits into from
Nov 4, 2025
Merged

Update cluster config #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
83faaee
convert tx ng configs to dss_config (#249)
lzxddz Oct 29, 2025
a228f1e
Introduce UNKNOWN_DSS_LEADER_NODE_ID
githubzilla Nov 2, 2025
8c2679c
Update store_handler
githubzilla Nov 3, 2025
49de4ff
Fix bug if eloq_dss_peer_node is not empty
githubzilla Nov 3, 2025
167fd89
Update store_handler and tx_service
githubzilla Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 43 additions & 4 deletions src/redis_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1017,9 +1017,45 @@ bool RedisServiceImpl::Init(brpc::Server &brpc_server)
std::filesystem::create_directories(eloq_dss_data_path);
}

std::string dss_config_file_path =
eloq_dss_data_path + "/dss_config.ini";
std::string dss_config_file_path = "";
EloqDS::DataStoreServiceClusterManager ds_config;
uint32_t dss_leader_id = EloqDS::UNKNOWN_DSS_LEADER_NODE_ID;

// use tx node id as the dss node id
// since they are deployed together
uint32_t dss_node_id = node_id;
if (FLAGS_bootstrap || is_single_node)
{
dss_leader_id = node_id;
}

if (!eloq_dss_peer_node.empty())
{
ds_config.SetThisNode(
local_ip,
EloqDS::DataStoreServiceClient::TxPort2DssPort(local_tx_port));
// Fetch ds topology from peer node
if (!EloqDS::DataStoreService::FetchConfigFromPeer(
eloq_dss_peer_node, ds_config))
{
LOG(ERROR) << "Failed to fetch config from peer node: "
<< eloq_dss_peer_node;
return false;
}
}
else
{
EloqDS::DataStoreServiceClient::TxConfigsToDssClusterConfig(
dss_node_id,
native_ng_id,
ng_configs,
dss_leader_id,
ds_config);
}
Comment on lines +1048 to +1054
Copy link
Contributor

@coderabbitai coderabbitai bot Nov 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion | 🟠 Major

Add error handling for TxConfigsToDssClusterConfig.

The call to TxConfigsToDssClusterConfig lacks error handling, unlike the peer fetch path (lines 1038-1044). If this function can fail, add appropriate error checking and return false on failure to maintain consistency with the peer fetch error handling.

🤖 Prompt for AI Agents 
In src/redis_service.cpp around lines 1048 to 1054, the call to
EloqDS::DataStoreServiceClient::TxConfigsToDssClusterConfig has no error
handling; mirror the peer-fetch path at lines 1038–1044 by checking the
function's return value, logging a clear error (including context such as
dss_node_id/native_ng_id) when it fails, and returning false from the
surrounding function on failure so behavior is consistent with the peer fetch
error handling.


// std::string dss_config_file_path =
// eloq_dss_data_path + "/dss_config.ini";
/*
EloqDS::DataStoreServiceClusterManager ds_config;
if (std::filesystem::exists(dss_config_file_path))
{
Expand Down Expand Up @@ -1071,6 +1107,7 @@ bool RedisServiceImpl::Init(brpc::Server &brpc_server)
return false;
}
}
*/

#if defined(DATA_STORE_TYPE_ELOQDSS_ROCKSDB_CLOUD_S3) || \
defined(DATA_STORE_TYPE_ELOQDSS_ROCKSDB_CLOUD_GCS)
Expand Down Expand Up @@ -1104,7 +1141,7 @@ bool RedisServiceImpl::Init(brpc::Server &brpc_server)
// Start data store service. (Also create datastore in StartService() if
// needed)
bool ret = data_store_service_->StartService(
(FLAGS_bootstrap || is_single_node));
(FLAGS_bootstrap || is_single_node), dss_leader_id, dss_node_id);
if (!ret)
{
LOG(ERROR) << "Failed to start data store service";
Expand All @@ -1121,7 +1158,9 @@ bool RedisServiceImpl::Init(brpc::Server &brpc_server)
store_hd_->AppendPreBuiltTable(table_name);
}

if (!store_hd_->Connect())
// do connect only when this is bootstrap or single node
// otherwise, connect when become leader or follower
if ((FLAGS_bootstrap || is_single_node) && !store_hd_->Connect())
{
LOG(ERROR) << "!!!!!!!! Failed to connect to kvstore, startup is "
"terminated !!!!!!!!";
Expand Down
2 changes: 1 addition & 1 deletion store_handler
Open in desktop
Submodule store_handler updated 16 files
+148 −6 data_store_service_client.cpp
+19 −1 data_store_service_client.h
+76 −9 eloq_data_store_service/data_store_service.cpp
+25 −13 eloq_data_store_service/data_store_service.h
+11 −8 eloq_data_store_service/data_store_service_config.cpp
+3 −0 eloq_data_store_service/data_store_service_config.h
+2 −13 eloq_data_store_service/eloq_store_config.cpp
+6 −2 eloq_data_store_service/eloq_store_data_store.cpp
+4 −6 eloq_data_store_service/main.cpp
+6 −2 eloq_data_store_service/rocksdb_cloud_data_store.cpp
+2 −0 eloq_data_store_service/rocksdb_cloud_data_store.h
+23 −3 eloq_data_store_service/rocksdb_cloud_dump.cpp
+6 −0 eloq_data_store_service/rocksdb_data_store_common.cpp
+3 −3 eloq_data_store_service/rocksdb_data_store_common.h
+6 −4 rocksdb_handler.cpp
+5 −2 rocksdb_handler.h
2 changes: 1 addition & 1 deletion tx_service
Open in desktop
Submodule tx_service updated 3 files
+10 −2 include/store/data_store_handler.h
+27 −4 src/fault/cc_node.cpp
+36 −8 src/store/snapshot_manager.cpp