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
Rename directory monitor concept into background INSERT #55978
Conversation
This is an automated comment for commit 985c74b with description of existing statuses. It's updated for the latest CI running ❌ Click here to open a full report in a separate page Successful checks
|
17daca1
to
ef7d8c8
Compare
Why? I understand that "directory monitor" exposes some internal name from code that a user should not know about, but:
|
Actually it should be 100% compatible, since old settings preserved as aliases for new ones, and there is a test for this.
But this in context of distributed, do you still think that they should not match? |
Sorry, I don't notice that from the first glance. And we already have settings aliases (I didn't know that), so it doesn't introduce more complexity. Then it's okay if the test is not flaky :)
Yes, I think that the "distributed_" prefix doesn't make it less confusing |
The problem is that there is old setting that named |
…essage After SYSTEM STOP DISTRIBUTED SENDS it will constantly print this message. Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
Rename the following query settings (with preserving backward compatiblity, by keeping old name as an alias): - distributed_directory_monitor_sleep_time_ms -> distributed_async_insert_sleep_time_ms - distributed_directory_monitor_max_sleep_time_ms -> distributed_async_insert_max_sleep_time_ms - distributed_directory_monitor_batch -> distributed_async_insert_batch_inserts - distributed_directory_monitor_split_batch_on_failure -> distributed_async_insert_split_batch_on_failure Rename the following table settings (with preserving backward compatiblity, by keeping old name as an alias): - monitor_batch_inserts -> async_insert_batch - monitor_split_batch_on_failure -> async_insert_split_batch_on_failure - directory_monitor_sleep_time_ms -> async_insert_sleep_time_ms - directory_monitor_max_sleep_time_ms -> async_insert_max_sleep_time_ms And also update all the references: $ gg -e directory_monitor_ -e monitor_ tests docs | cut -d: -f1 | sort -u | xargs sed -e 's/distributed_directory_monitor_sleep_time_ms/distributed_async_insert_sleep_time_ms/g' -e 's/distributed_directory_monitor_max_sleep_time_ms/distributed_async_insert_max_sleep_time_ms/g' -e 's/distributed_directory_monitor_batch_inserts/distributed_async_insert_batch/g' -e 's/distributed_directory_monitor_split_batch_on_failure/distributed_async_insert_split_batch_on_failure/g' -e 's/monitor_batch_inserts/async_insert_batch/g' -e 's/monitor_split_batch_on_failure/async_insert_split_batch_on_failure/g' -e 's/monitor_sleep_time_ms/async_insert_sleep_time_ms/g' -e 's/monitor_max_sleep_time_ms/async_insert_max_sleep_time_ms/g' -i Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@tavplubix how about "background_insert"? It actually even better describe what internally happens. |
Yep, sounds good |
This will avoid amigibuity between general async INSERT's and INSERT into Distributed, which are indeed background, so new term express it even better. Mostly done with: $ git di HEAD^ --name-only | xargs sed -i -e 's/distributed_async_insert/distributed_background_insert/g' -e 's/async_insert_batch/background_insert_batch/g' -e 's/async_insert_split_batch_on_failure/background_insert_split_batch_on_failure/g' -e 's/async_insert_sleep_time_ms/background_insert_sleep_time_ms/g' -e 's/async_insert_max_sleep_time_ms/background_insert_max_sleep_time_ms/g' Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
CI: https://s3.amazonaws.com/clickhouse-test-reports/55978/7a6abb03a0b507e29e999cb7e04f246a119c6f28/stateless_tests_flaky_check__asan_.html Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
|
|
Changelog category (leave one):
Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
Rename directory monitor concept into background INSERT. All settings
*directory_monitor*
had been renamed todistributed_background_insert*
. Backward compatibility should be preserved (since old settings had been added as an alias).Rename the following query settings (with preserving backward compatibility, by keeping old name as an alias):
distributed_directory_monitor_sleep_time_ms
->distributed_background_insert_sleep_time_ms
distributed_directory_monitor_max_sleep_time_ms
->distributed_background_insert_max_sleep_time_ms
distributed_directory_monitor_batch
->distributed_background_insert_batch_inserts
distributed_directory_monitor_split_batch_on_failure
->distributed_background_insert_split_batch_on_failure
insert_distributed_sync
->distributed_foreground_insert
insert_distributed_timeout
->distributed_background_insert_timeout
And also group all settings related to distributed INSERTs in one place in
Settings.h
Rename the following table settings (with preserving backward compatibility, by keeping old name as an alias):
monitor_batch_inserts
->background_insert_batch
monitor_split_batch_on_failure
->background_insert_split_batch_on_failure
directory_monitor_sleep_time_ms
->background_insert_sleep_time_ms
directory_monitor_max_sleep_time_ms
->background_insert_max_sleep_time_ms
P.S. Marked as
Backward Incompatible Change
just to underling this change in changelog.Follow-up for: #45491 (cc @tavplubix @hanfei1991 )