From e5cd21ab0a1a86a413684ac6c84d327d18967c6b Mon Sep 17 00:00:00 2001 From: fogelito Date: Sat, 21 Oct 2023 00:48:05 +0300 Subject: [PATCH 1/4] Fix logger .env and getFiles --- .env | 2 +- docker-compose.yml | 4 ++++ src/Appwrite/Platform/Tasks/Backup.php | 3 +-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.env b/.env index 97c33b6cc7..12f5e9618a 100644 --- a/.env +++ b/.env @@ -35,7 +35,7 @@ _APP_CONNECTIONS_CACHE=redis_fra1_01=redis://redis:6379 _APP_CONNECTIONS_QUEUE=redis_fra1_01=redis://redis:6379 _APP_CONNECTIONS_PUBSUB=redis_fra1_01=redis://redis:6379 _APP_CONNECTIONS_STORAGE=local://localhost -_APP_CONNECTIONS_BACKUPS_STORAGE=dospaces://ACCESS:SECRET@default/backups-v1?region=fra1 +_APP_CONNECTIONS_BACKUPS_STORAGE=dospaces://DO00D8TGJBLQ3DGQMXCX:LfOpNUvUN1NcwhA8CUCTYTCPWNhCkZOTmL9ub24cszM@default/backups-v1?region=fra1 _APP_STORAGE_DEVICE=Local _APP_STORAGE_S3_ACCESS_KEY= _APP_STORAGE_S3_SECRET= diff --git a/docker-compose.yml b/docker-compose.yml index be732b302c..34339824dc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -843,6 +843,8 @@ services: image: appwrite-dev <<: *x-logging entrypoint: db-backup + command: + - --database=db_fra1_03 container_name: appwrite-backup networks: - appwrite @@ -856,6 +858,8 @@ services: environment: - _APP_CONNECTIONS_DB_REPLICAS - _APP_CONNECTIONS_BACKUPS_STORAGE + - _APP_LOGGING_PROVIDER + - _APP_LOGGING_CONFIG appwrite-restore: command: sleep infinity diff --git a/src/Appwrite/Platform/Tasks/Backup.php b/src/Appwrite/Platform/Tasks/Backup.php index 3eeb6755fa..f6159e710e 100644 --- a/src/Appwrite/Platform/Tasks/Backup.php +++ b/src/Appwrite/Platform/Tasks/Backup.php @@ -374,8 +374,7 @@ class Backup extends Action self::log('Clean cloud start'); $start = microtime(true); $files = $this->s3->getFiles($this->s3->getRoot()); - - if ($files['KeyCount'] > 0) { + if ($files['KeyCount'] > 1) { // Bug when is one returned it returns an object not an array! foreach ($files['Contents'] as $file) { $date = basename(basename($file['Key']), '.tar.gz'); if ($this->isDelete($date, self::CLEANUP_CLOUD_FILES_SECONDS)) { From 060dd300ff9aa90c684693af26a415efb4432550 Mon Sep 17 00:00:00 2001 From: fogelito Date: Sat, 21 Oct 2023 01:05:25 +0300 Subject: [PATCH 2/4] CLEANUP_TIME 7 days --- src/Appwrite/Platform/Tasks/Backup.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Appwrite/Platform/Tasks/Backup.php b/src/Appwrite/Platform/Tasks/Backup.php index f6159e710e..32bdbd7c9d 100644 --- a/src/Appwrite/Platform/Tasks/Backup.php +++ b/src/Appwrite/Platform/Tasks/Backup.php @@ -18,8 +18,8 @@ class Backup extends Action public const BACKUPS_PATH = '/backups'; public const BACKUP_INTERVAL_SECONDS = 60 * 60 * 4; // 4 hours; public const COMPRESS_ALGORITHM = 'zstd'; // https://www.percona.com/blog/get-your-backup-to-half-of-its-size-introducing-zstd-support-in-percona-xtrabackup/ - public const CLEANUP_LOCAL_FILES_SECONDS = 60 * 60 * 24 * 30; // 2 days? - public const CLEANUP_CLOUD_FILES_SECONDS = 60 * 60 * 24 * 30; // 14 days?; + public const CLEANUP_LOCAL_FILES_SECONDS = 60 * 60 * 24 * 7; + public const CLEANUP_CLOUD_FILES_SECONDS = 60 * 60 * 24 * 7; public const UPLOAD_CHUNK_SIZE = 5 * 1024 * 1024; // Must be greater than 5MB; public const RETRY_BACKUP = 1; public const RETRY_TAR = 1; From f5ab49aa15b83791b75b5bce8dc2dfe823cb91cf Mon Sep 17 00:00:00 2001 From: fogelito Date: Sat, 21 Oct 2023 01:08:52 +0300 Subject: [PATCH 3/4] docker-compose.yml --- docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 34339824dc..5de7c6b9e3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -843,8 +843,6 @@ services: image: appwrite-dev <<: *x-logging entrypoint: db-backup - command: - - --database=db_fra1_03 container_name: appwrite-backup networks: - appwrite From 12957ef4e4157ed60fe7f193ca1910102fc4941d Mon Sep 17 00:00:00 2001 From: fogelito Date: Sat, 21 Oct 2023 01:13:47 +0300 Subject: [PATCH 4/4] .env --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 12f5e9618a..97c33b6cc7 100644 --- a/.env +++ b/.env @@ -35,7 +35,7 @@ _APP_CONNECTIONS_CACHE=redis_fra1_01=redis://redis:6379 _APP_CONNECTIONS_QUEUE=redis_fra1_01=redis://redis:6379 _APP_CONNECTIONS_PUBSUB=redis_fra1_01=redis://redis:6379 _APP_CONNECTIONS_STORAGE=local://localhost -_APP_CONNECTIONS_BACKUPS_STORAGE=dospaces://DO00D8TGJBLQ3DGQMXCX:LfOpNUvUN1NcwhA8CUCTYTCPWNhCkZOTmL9ub24cszM@default/backups-v1?region=fra1 +_APP_CONNECTIONS_BACKUPS_STORAGE=dospaces://ACCESS:SECRET@default/backups-v1?region=fra1 _APP_STORAGE_DEVICE=Local _APP_STORAGE_S3_ACCESS_KEY= _APP_STORAGE_S3_SECRET=