diff --git a/src/redis_service.cpp b/src/redis_service.cpp index 435b1c9b..e4bcad36 100644 --- a/src/redis_service.cpp +++ b/src/redis_service.cpp @@ -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, @@ -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 @@ -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>( diff --git a/store_handler b/store_handler index a3fdbbc8..70ef6795 160000 --- a/store_handler +++ b/store_handler @@ -1 +1 @@ -Subproject commit a3fdbbc866c98b4e70a02aac31a17f408d45d15a +Subproject commit 70ef6795c0fa7b73b0d83afd949765cbd4f734f1 diff --git a/tx_service b/tx_service index b823488d..a3cd3a01 160000 --- a/tx_service +++ b/tx_service @@ -1 +1 @@ -Subproject commit b823488d3c6e01e1bb2e11a4469e2823ba0be9a6 +Subproject commit a3cd3a013b07a9d9be2944aac5b549e7dd334c4e