chore: randomize more and name non-sharded backups noshard

PostHog · Jun 8, 2024 · 809109b · 809109b
1 parent f709d58
commit 809109b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/housewatch/clickhouse/backups.py b/housewatch/clickhouse/backups.py
@@ -36,7 +36,7 @@ def execute_backup(
     nodes = get_node_per_shard(cluster)
     responses = []
     for shard, node in nodes:
-        params["shard"] = shard
+        params["shard"] = shard if is_sharded else "noshard"
         if base_backup:
             query_settings["base_backup"] = f"S3('{base_backup}/{shard}', '{aws_key}', '{aws_secret}')"
         final_query = query % (params or {}) if substitute_params else query

diff --git a/housewatch/clickhouse/clusters.py b/housewatch/clickhouse/clusters.py
@@ -48,4 +48,5 @@ def get_node_per_shard(cluster):
                 break
         if not preferred_replica_found:
             nodes.append((shard, random.choice(n)))
+    random.shuffle(nodes)
     return nodes