Moved timeout for alter queries to config (#103)

yandex · Feb 16, 2024 · deeefdf · deeefdf
1 parent 0ea863d
commit deeefdf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 43 deletions.
diff --git a/ch_tools/chadmin/internal/partition.py b/ch_tools/chadmin/internal/partition.py
@@ -1,78 +1,46 @@
 from ch_tools.chadmin.internal.utils import execute_query
 
-DEFAULT_TIMEOUT = 600
-
 
 def attach_partition(ctx, database, table, partition_id, dry_run=False):
     """
     Attach the specified table partition.
     """
     query = f"ALTER TABLE `{database}`.`{table}` ATTACH PARTITION ID '{partition_id}'"
-    execute_query(
-        ctx,
-        query,
-        timeout=DEFAULT_TIMEOUT,
-        format_=None,
-        echo=True,
-        dry_run=dry_run,
-    )
+    _execute_query(ctx, query, dry_run)
 
 
 def detach_partition(ctx, database, table, partition_id, dry_run=False):
     """
     Detach the specified table partition.
     """
     query = f"ALTER TABLE `{database}`.`{table}` DETACH PARTITION ID '{partition_id}'"
-    execute_query(
-        ctx,
-        query,
-        timeout=DEFAULT_TIMEOUT,
-        format_=None,
-        echo=True,
-        dry_run=dry_run,
-    )
+    _execute_query(ctx, query, dry_run)
 
 
 def drop_partition(ctx, database, table, partition_id, dry_run=False):
     """
     Drop the specified table partition.
     """
     query = f"ALTER TABLE `{database}`.`{table}` DROP PARTITION ID '{partition_id}'"
-    execute_query(
-        ctx,
-        query,
-        timeout=DEFAULT_TIMEOUT,
-        format_=None,
-        echo=True,
-        dry_run=dry_run,
-    )
+    _execute_query(ctx, query, dry_run)
 
 
 def optimize_partition(ctx, database, table, partition_id, dry_run=False):
     """
     Optimize the specified table partition.
     """
     query = f"OPTIMIZE TABLE `{database}`.`{table}` PARTITION ID '{partition_id}'"
-    execute_query(
-        ctx,
-        query,
-        timeout=DEFAULT_TIMEOUT,
-        format_=None,
-        echo=True,
-        dry_run=dry_run,
-    )
+    _execute_query(ctx, query, dry_run)
 
 
 def materialize_ttl_in_partition(ctx, database, table, partition_id, dry_run=False):
     """
     Materialize TTL for the specified table partition.
     """
     query = f"ALTER TABLE `{database}`.`{table}` MATERIALIZE TTL IN PARTITION ID '{partition_id}'"
-    execute_query(
-        ctx,
-        query,
-        timeout=DEFAULT_TIMEOUT,
-        format_=None,
-        echo=True,
-        dry_run=dry_run,
-    )
+    _execute_query(ctx, query, dry_run)
+
+
+def _execute_query(ctx, query, dry_run):
+    timeout = ctx.obj["config"]["clickhouse"]["alter_table_timeout"]
+    execute_query(ctx, query, timeout=timeout, format_=None, echo=True, dry_run=dry_run)
diff --git a/ch_tools/common/config.py b/ch_tools/common/config.py
@@ -14,11 +14,12 @@
         "port": 8443,
         "user": None,
         "password": None,
-        "timeout": 60,
         "settings": {},
         "monitoring_user": None,
         "monitoring_password": None,
         "distributed_ddl_path": "/clickhouse/task_queue/ddl",
+        "timeout": 60,
+        "alter_table_timeout": 600,
     },
     "object_storage": {
         "clean": {