From b308ad8bfcd47720114fe6cb80b9f89e6504288f Mon Sep 17 00:00:00 2001
From: James Greenhill <fuziontech@gmail.com>
Date: Wed, 31 Jan 2024 15:08:12 -0800
Subject: [PATCH] Potential fix for the incremental runs always run as a base
 backup

---
 housewatch/clickhouse/backups.py | 72 +++++++++-----------------------
 1 file changed, 20 insertions(+), 52 deletions(-)

diff --git a/housewatch/clickhouse/backups.py b/housewatch/clickhouse/backups.py
index 063fdc3..27e0eb4 100644
--- a/housewatch/clickhouse/backups.py
+++ b/housewatch/clickhouse/backups.py
@@ -60,6 +60,7 @@ def execute_backup(
             response.append(item)
         responses.append((shard, response))
         if not is_sharded:
+            # if the table is not sharded then just run the backup on one node
             return response
     return response
 
@@ -83,39 +84,19 @@ def get_backup(backup, cluster=None):
 
 
 def create_table_backup(
-    database, table, bucket, path, cluster=None, aws_key=None, aws_secret=None, base_backup=None, is_sharded=False
+    database, table, bucket, path, cluster, aws_key=None, aws_secret=None, base_backup=None, is_sharded=False
 ):
     if aws_key is None or aws_secret is None:
         aws_key = settings.AWS_ACCESS_KEY_ID
         aws_secret = settings.AWS_SECRET_ACCESS_KEY
+
     query_settings = {}
-    if cluster:
-        QUERY = """BACKUP TABLE %(database)s.%(table)s
-        TO S3('https://%(bucket)s.s3.amazonaws.com/%(path)s/%(shard)s', '%(aws_key)s', '%(aws_secret)s')
-        ASYNC"""
-        return execute_backup(
-            QUERY,
-            {
-                "database": database,
-                "table": table,
-                "bucket": bucket,
-                "path": path,
-                "aws_key": aws_key,
-                "aws_secret": aws_secret,
-            },
-            query_settings=query_settings,
-            cluster=cluster,
-            aws_key=aws_key,
-            aws_secret=aws_secret,
-            base_backup=base_backup,
-            is_sharded=is_sharded,
-        )
     QUERY = """BACKUP TABLE %(database)s.%(table)s
-    TO S3('https://%(bucket)s.s3.amazonaws.com/%(path)s', '%(aws_key)s', '%(aws_secret)s')
+    TO S3('https://%(bucket)s.s3.amazonaws.com/%(path)s/%(shard)s', '%(aws_key)s', '%(aws_secret)s')
     ASYNC"""
     if base_backup:
         query_settings["base_backup"] = f"S3('{base_backup}', '{aws_key}', '{aws_secret}')"
-    return run_query(
+    return execute_backup(
         QUERY,
         {
             "database": database,
@@ -126,41 +107,25 @@ def create_table_backup(
             "aws_secret": aws_secret,
         },
         query_settings=query_settings,
-        use_cache=False,
+        cluster=cluster,
+        aws_key=aws_key,
+        aws_secret=aws_secret,
+        base_backup=base_backup,
+        is_sharded=is_sharded,
     )
 
 
-def create_database_backup(database, bucket, path, cluster=None, aws_key=None, aws_secret=None, base_backup=None):
+def create_database_backup(database, bucket, path, cluster, aws_key=None, aws_secret=None, base_backup=None):
     if aws_key is None or aws_secret is None:
         aws_key = settings.AWS_ACCESS_KEY_ID
         aws_secret = settings.AWS_SECRET_ACCESS_KEY
     query_settings = {}
-    if cluster:
-        QUERY = """BACKUP DATABASE %(database)s 
-                    TO S3('https://%(bucket)s.s3.amazonaws.com/%(path)s/%(shard)s', '%(aws_key)s', '%(aws_secret)s')
-                    ASYNC"""
-
-        return execute_backup(
-            QUERY,
-            {
-                "database": database,
-                "bucket": bucket,
-                "path": path,
-                "aws_key": aws_key,
-                "aws_secret": aws_secret,
-            },
-            query_settings=query_settings,
-            cluster=cluster,
-            aws_key=aws_key,
-            aws_secret=aws_secret,
-            base_backup=base_backup,
-        )
-    QUERY = """BACKUP DATABASE %(database)s
-                TO S3('https://%(bucket)s.s3.amazonaws.com/%(path)s', '%(aws_key)s', '%(aws_secret)s')
+    QUERY = """BACKUP DATABASE %(database)s 
+                TO S3('https://%(bucket)s.s3.amazonaws.com/%(path)s/%(shard)s', '%(aws_key)s', '%(aws_secret)s')
                 ASYNC"""
     if base_backup:
         query_settings["base_backup"] = f"S3('{base_backup}', '{aws_key}', '{aws_secret}')"
-    return run_query(
+    return execute_backup(
         QUERY,
         {
             "database": database,
@@ -170,7 +135,10 @@ def create_database_backup(database, bucket, path, cluster=None, aws_key=None, a
             "aws_secret": aws_secret,
         },
         query_settings=query_settings,
-        use_cache=False,
+        cluster=cluster,
+        aws_key=aws_key,
+        aws_secret=aws_secret,
+        base_backup=base_backup,
     )
 
 
@@ -191,10 +159,10 @@ def run_backup(backup_id, incremental=False):
             backup.database,
             backup.bucket,
             path,
-            backup.cluster,
             backup.aws_access_key_id,
             backup.aws_secret_access_key,
             base_backup=base_backup,
+            cluster=backup.cluster,
         )
     elif backup.is_table_backup():
         create_table_backup(
@@ -202,11 +170,11 @@ def run_backup(backup_id, incremental=False):
             backup.table,
             backup.bucket,
             path,
-            backup.cluster,
             backup.aws_access_key_id,
             backup.aws_secret_access_key,
             base_backup=base_backup,
             is_sharded=backup.is_sharded,
+            cluster=backup.cluster,
         )
     uuid = str(uuid4())
     br = ScheduledBackupRun.objects.create(