Skip to content

Add s3 url config #222

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

Open
githubzilla wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Add s3 url config #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bb07e8b
Add s3_url
githubzilla Oct 13, 2025
9296c34
Update store_handler
githubzilla Oct 13, 2025
844c706
Remove parse s3_url logic
githubzilla Oct 13, 2025
b57d30f
Fix clang-format
githubzilla Oct 23, 2025
d214eec
Update store_handler
githubzilla Oct 23, 2025
b612408
Update store_handler
githubzilla Oct 23, 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
19 changes: 19 additions & 0 deletions src/redis_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,14 @@ DEFINE_string(txlog_rocksdb_cloud_endpoint_url,
DEFINE_string(txlog_rocksdb_cloud_sst_file_cache_size,
"1GB",
"Local sst cache size for txlog");
DEFINE_string(txlog_rocksdb_cloud_s3_url,
"",
"TxLog RocksDB cloud S3 URL. Format: s3://{bucket}/{path} or "
"http(s)://{host}:{port}/{bucket}/{path}. "
"Examples: s3://my-bucket/my-path, "
"http://localhost:9000/my-bucket/my-path. "
"This option takes precedence over legacy configuration options "
"if both are provided");
#endif
#ifdef WITH_CLOUD_AZ_INFO
DEFINE_string(txlog_rocksdb_cloud_prefer_zone,
Expand Down Expand Up @@ -1697,6 +1705,16 @@ bool RedisServiceImpl::InitTxLogService(
? FLAGS_aws_secret_key
: config_reader.GetString("store", "aws_secret_key", "");
#endif /* LOG_STATE_TYPE_RKDB_S3 */

// Get the S3 URL configuration (new style)
txlog_rocksdb_cloud_config.s3_url_ =
!CheckCommandLineFlagIsDefault("txlog_rocksdb_cloud_s3_url")
? FLAGS_txlog_rocksdb_cloud_s3_url
: config_reader.GetString("local",
"txlog_rocksdb_cloud_s3_url",
FLAGS_txlog_rocksdb_cloud_s3_url);

// Get legacy configuration
txlog_rocksdb_cloud_config.endpoint_url_ =
!CheckCommandLineFlagIsDefault("txlog_rocksdb_cloud_endpoint_url")
? FLAGS_txlog_rocksdb_cloud_endpoint_url
Expand Down Expand Up @@ -1783,6 +1801,7 @@ bool RedisServiceImpl::InitTxLogService(
txlog_rocksdb_cloud_config.log_purger_starting_second_ =
log_purger_tm.tm_sec;
}

if (FLAGS_bootstrap)
{
log_server_ = std::make_unique<::txlog::LogServer>(
Expand Down
2 changes: 1 addition & 1 deletion store_handler
Open in desktop
Submodule store_handler updated 12 files
+10 −10 data_store_service_client.cpp
+2 −5 data_store_service_client_closure.cpp
+123 −1 eloq_data_store_service/README.md
+30 −4 eloq_data_store_service/RocksDB_Configuration_Flags.md
+4 −1 eloq_data_store_service/data_store_service.cpp
+57 −3 eloq_data_store_service/eloq_store_data_store.cpp
+1 −0 eloq_data_store_service/eloq_store_data_store.h
+4 −1 eloq_data_store_service/eloq_store_data_store_factory.h
+52 −17 eloq_data_store_service/rocksdb_cloud_data_store.cpp
+43 −8 eloq_data_store_service/rocksdb_cloud_dump.cpp
+19 −5 eloq_data_store_service/rocksdb_config.cpp
+109 −0 eloq_data_store_service/rocksdb_config.h
2 changes: 1 addition & 1 deletion tx_service
Open in desktop
Submodule tx_service updated 8 files
+1 −1 include/cc/cc_request.h
+2 −1 include/cc/cc_shard.h
+30 −18 include/cc/local_cc_shards.h
+3 −0 include/tx_service.h
+2 −2 src/cc/cc_shard.cpp
+3 −0 src/cc/local_cc_handler.cpp
+130 −38 src/cc/local_cc_shards.cpp
+2 −3 src/store/snapshot_manager.cpp