Skip to content

Do not delete zero-copy locks by default #391

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
kirillgarbar wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Do not delete zero-copy locks by default #391

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
52 changes: 38 additions & 14 deletions ch_tools/chadmin/cli/zookeeper_group.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,10 +340,21 @@ def delete_ddl_task_command(ctx: Context, tasks: list) -> None:
help="Perform ddl query cleanup.",
type=bool,
)
@option(
"--delete-zero-copy-locks",
"delete_locks",
is_flag=True,
help="Delete zero-copy locks for removed hosts.",
type=bool,
)
@argument("fqdn", type=ListParamType())
@pass_context
def clickhouse_hosts_command(
ctx: Context, fqdn: list, clean_ddl_queue: bool, dry_run: bool
ctx: Context,
fqdn: list,
clean_ddl_queue: bool,
dry_run: bool,
delete_locks: bool,
) -> None:
# We can't get the ddl queue path from clickhouse config,
# because in some cases we are changing this path while performing cluster resetup.
Expand All @@ -355,12 +366,13 @@ def clickhouse_hosts_command(
zk_ddl_query_path=config["clickhouse"]["distributed_ddl_path"],
dry_run=dry_run,
)
for replica in fqdn:
delete_zero_copy_locks(
ctx,
replica_name=replica,
dry_run=dry_run,
)
if delete_locks:
for replica in fqdn:
delete_zero_copy_locks(
ctx,
replica_name=replica,
dry_run=dry_run,
)


@zookeeper_group.command(
Expand All @@ -374,11 +386,22 @@ def clickhouse_hosts_command(
default=False,
help="Enable dry run mode and do not perform any modifying actions.",
)
@option(
"--delete-zero-copy-locks",
"delete_locks",
is_flag=True,
help="Delete zero-copy locks for removed hosts.",
type=bool,
)
@argument("zookeeper-table-path")
@argument("fqdn", type=ListParamType())
@pass_context
def remove_hosts_from_table(
ctx: Context, zookeeper_table_path: str, fqdn: list, dry_run: bool
ctx: Context,
zookeeper_table_path: str,
fqdn: list,
dry_run: bool,
delete_locks: bool,
) -> None:
clean_zk_metadata_for_hosts(
ctx,
Expand All @@ -388,12 +411,13 @@ def remove_hosts_from_table(
cleanup_ddl_queue=False,
dry_run=dry_run,
)
for replica in fqdn:
delete_zero_copy_locks(
ctx,
replica_name=replica,
dry_run=dry_run,
)
if delete_locks:
for replica in fqdn:
delete_zero_copy_locks(
ctx,
replica_name=replica,
dry_run=dry_run,
)


@zookeeper_group.command("cleanup-zero-copy-locks")
Expand Down
Loading