Skip to content
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

Rename tiflash_storage to tiflash_write #7049

Merged
merged 1 commit into from
Mar 11, 2023
Merged

Rename tiflash_storage to tiflash_write #7049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions dbms/src/Core/TiFlashDisaggregatedMode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ DisaggregatedMode getDisaggregatedMode(const Poco::Util::LayeredConfiguration &
if (config.has(config_key))
{
std::string mode_str = config.getString(config_key);
RUNTIME_ASSERT(mode_str == DISAGGREGATED_MODE_STORAGE || mode_str == DISAGGREGATED_MODE_COMPUTE,
RUNTIME_ASSERT(mode_str == DISAGGREGATED_MODE_WRITE || mode_str == DISAGGREGATED_MODE_COMPUTE,
"Expect disaggregated_mode is {} or {}, got: {}",
DISAGGREGATED_MODE_STORAGE,
DISAGGREGATED_MODE_WRITE,
DISAGGREGATED_MODE_COMPUTE,
mode_str);
if (mode_str == DISAGGREGATED_MODE_COMPUTE)
Expand Down
6 changes: 4 additions & 2 deletions dbms/src/Core/TiFlashDisaggregatedMode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@

#define DEF_PROXY_LABEL "tiflash"
#define DISAGGREGATED_MODE_COMPUTE_PROXY_LABEL DISAGGREGATED_MODE_COMPUTE
#define DISAGGREGATED_MODE_STORAGE "tiflash_storage"
// Note that TiFlash Write Node is also named as TiFlash Storage Node in many places.
// To make sure it is consistent to our documents, we better stick with "tiflash_write" in the configurations.
#define DISAGGREGATED_MODE_WRITE "tiflash_write"
#define DISAGGREGATED_MODE_COMPUTE "tiflash_compute"
// engine_role determine whether TiFlash use S3 to write.
#define DISAGGREGATED_MODE_STORAGE_ENGINE_ROLE "write"
#define DISAGGREGATED_MODE_WRITE_ENGINE_ROLE "write"

namespace DB
{
Expand Down
2 changes: 1 addition & 1 deletion dbms/src/Server/Server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ struct TiFlashProxyConfig
args_map[engine_label] = getProxyLabelByDisaggregatedMode(disaggregated_mode);
if (disaggregated_mode != DisaggregatedMode::Compute && has_s3_config)
{
args_map[engine_role_label] = DISAGGREGATED_MODE_STORAGE_ENGINE_ROLE;
args_map[engine_role_label] = DISAGGREGATED_MODE_WRITE_ENGINE_ROLE;
}

for (auto && [k, v] : args_map)
Expand Down