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.

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

settings: remove mpp_time_out related config #9760

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions dbms/src/Core/Defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@

#define DEFAULT_MAX_READ_TSO 0xFFFFFFFFFFFFFFFF
#define DEFAULT_UNSPECIFIED_SCHEMA_VERSION (-1)
#define DEFAULT_MPP_TASK_TIMEOUT 10
#define DEFAULT_MPP_TASK_RUNNING_TIMEOUT (DEFAULT_MPP_TASK_TIMEOUT + 30)
#define DEFAULT_MPP_TASK_WAITING_TIMEOUT 36000

// Timeout for building one disagg task in the TiFlash write node.
// Including read index / wait index / generate segments snapshots.
Expand Down
16 changes: 0 additions & 16 deletions dbms/src/Flash/Mpp/MPPTask.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -409,22 +409,6 @@ void MPPTask::prepare(const mpp::DispatchTaskRequest & task_request)

context->setSetting("read_tso", start_ts);
context->setSetting("schema_version", schema_ver);
if (unlikely(task_request.timeout() < 0))
{
/// this is only for test
context->setSetting("mpp_task_timeout", static_cast<Int64>(5));
context->setSetting("mpp_task_running_timeout", static_cast<Int64>(10));
}
else
{
context->setSetting("mpp_task_timeout", task_request.timeout());
if (task_request.timeout() > 0)
{
/// in the implementation, mpp_task_timeout is actually the task writing tunnel timeout
/// so make the mpp_task_running_timeout a little bigger than mpp_task_timeout
context->setSetting("mpp_task_running_timeout", task_request.timeout() + 30);
}
}
context->getTimezoneInfo().resetByDAGRequest(dag_req);

bool is_root_mpp_task = false;
Expand Down
3 changes: 0 additions & 3 deletions dbms/src/Interpreters/Settings.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@ struct Settings
M(SettingInt64, batch_send_min_limit, DEFAULT_BATCH_SEND_MIN_LIMIT, "default minimal chunk size of exchanging data among TiFlash.") \
M(SettingInt64, batch_send_min_limit_compression, -1, "default minimal chunk size of exchanging data among TiFlash when using data compression.") \
M(SettingInt64, schema_version, DEFAULT_UNSPECIFIED_SCHEMA_VERSION, "TiDB query schema version.") \
M(SettingUInt64, mpp_task_timeout, DEFAULT_MPP_TASK_TIMEOUT, "mpp task max endurable time.") \
M(SettingUInt64, mpp_task_running_timeout, DEFAULT_MPP_TASK_RUNNING_TIMEOUT, "mpp task max time that running without any progress.") \
M(SettingUInt64, mpp_task_waiting_timeout, DEFAULT_MPP_TASK_WAITING_TIMEOUT, "mpp task max time that waiting first data block from source input stream.") \
M(SettingInt64, safe_point_update_interval_seconds, 1, "The interval in seconds to update safe point from PD.") \
M(SettingUInt64, max_block_size, DEFAULT_BLOCK_SIZE, "Maximum block rows for reading") \
M(SettingUInt64, max_block_bytes, DEFAULT_BLOCK_BYTES, "Maximum block bytes for reading") \
Expand Down