@stamhoofd/backend-backup 2.116.0 → 2.117.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend-backup",
-    "version": "2.116.0",
+    "version": "2.117.1",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -34,5 +34,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "842040d2dcbde452fb25178f3586c8d5293b974f"
+    "gitHead": "ac4ccac9c6dabba9abd19c830b42a4a37298fd77"
 }

package/src/helpers/backup.ts

@@ -17,8 +17,8 @@ const execPromise = util.promisify(exec);
 // Since well create a backup every day, keeping 1000 binary logs would give
 // a full history of 40 days - and leaves us enough margin in case more
 // logs are created in a day
-const MAX_BINARY_LOGS = 200;
-const MAX_BACKUPS = 30; // in days
+let MAX_BINARY_LOGS = 3000; // ±9 GB = ±90days
+const MAX_BACKUPS = 90; // in days = ±270 GB
 const BACKUP_PREFIX = 'backup-';
 const BINARY_LOG_PREFIX = 'binlog.';
 
@@ -72,10 +72,10 @@ export function getHealth(): BackupHealth {
         status = 'error';
     }
     else {
-        if (LAST_BINARY_BACKUP.date.getTime() - now.getTime() > 60 * 10 * 1000) {
+        if (now.getTime() - LAST_BINARY_BACKUP.date.getTime() > 60 * 10 * 1000) {
             status = 'error';
         }
-        if (LAST_BACKUP.date.getTime() - now.getTime() > 60 * 60 * 1000 * 25) {
+        if (now.getTime() - LAST_BACKUP.date.getTime() > 60 * 60 * 1000 * 25) {
             status = 'error';
         }
         if (LAST_BACKUP.size < (STAMHOOFD.MINIMUM_BACKUP_SIZE ?? 1 * 1000 * 1000)) {
@@ -148,7 +148,8 @@ export async function cleanBinaryLogBackups() {
     const client = getS3Client();
 
     // List all backup files on the server
-    const allBackups = (await listAllFiles(STAMHOOFD.objectStoragePath + '/binlogs')).filter(f => f.key.endsWith('.enc') && path.basename(f.key).startsWith(BINARY_LOG_PREFIX));
+    const allBackups = (await listAllFiles(STAMHOOFD.objectStoragePath + '/binlogs')).filter(f => f.key.endsWith('.enc') && f.key.startsWith(BINARY_LOG_PREFIX));
+
     const numberToDelete = allBackups.length - MAX_BINARY_LOGS;
 
     if (numberToDelete <= 0) {
@@ -206,6 +207,10 @@ export async function listAllFiles(prefix: string): Promise<ObjectStorageFile[]>
             break;
         }
 
+        if (response.Contents.length < 1000) {
+            break;
+        }
+
         marker = response.NextMarker;
     }
 
@@ -456,9 +461,8 @@ export async function backupBinlogs() {
 
     if (rows.length > MAX_BINARY_LOGS) {
         console.error(chalk.bold(chalk.red('Warning: MAX_BINARY_LOGS is larger than the binary logs stored on the system. Please check the MySQL configuration.')));
-
-        // Only copy last MAX_BINARY_LOGS rows
-        rows.splice(0, rows.length - MAX_BINARY_LOGS);
+        console.error('Found ' + rows.length + ' binlogs. Increasing binary logs max size.');
+        MAX_BINARY_LOGS = rows.length;
     }
 
     const lastRow = rows.pop();