Fix backup check tool

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
hcengineering · Oct 20, 2024 · dfa0e3f · dfa0e3f
1 parent d65176f
commit dfa0e3f
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 35 deletions.
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/server/backup-service/package.json b/server/backup-service/package.json
@@ -33,7 +33,7 @@
     "eslint-config-standard-with-typescript": "^40.0.0",
     "prettier": "^3.1.0",
     "typescript": "^5.3.3",
-    "@types/tar-stream": "^2.2.2",
+    "@types/tar-stream": "^3.1.3",
     "@types/node": "~20.11.16",
     "jest": "^29.7.0",
     "ts-jest": "^29.1.1",
@@ -46,7 +46,7 @@
     "@hcengineering/client-resources": "^0.6.27",
     "@hcengineering/client": "^0.6.18",
     "@hcengineering/model": "^0.6.11",
-    "tar-stream": "^2.2.0",
+    "tar-stream": "^3.1.7",
     "@hcengineering/server-tool": "^0.6.0",
     "@hcengineering/server-core": "^0.6.1",
     "@hcengineering/server-storage": "^0.6.0",

diff --git a/server/backup/package.json b/server/backup/package.json
@@ -33,7 +33,7 @@
     "eslint-config-standard-with-typescript": "^40.0.0",
     "prettier": "^3.1.0",
     "typescript": "^5.3.3",
-    "@types/tar-stream": "^2.2.2",
+    "@types/tar-stream": "^3.1.3",
     "@types/node": "~20.11.16",
     "jest": "^29.7.0",
     "ts-jest": "^29.1.1",
@@ -47,7 +47,7 @@
     "@hcengineering/client": "^0.6.18",
     "@hcengineering/model": "^0.6.11",
     "@hcengineering/analytics": "^0.6.0",
-    "tar-stream": "^2.2.0",
+    "tar-stream": "^3.1.7",
     "@hcengineering/server-tool": "^0.6.0",
     "@hcengineering/server-client": "^0.6.0",
     "@hcengineering/server-token": "^0.6.11",

diff --git a/server/backup/src/backup.ts b/server/backup/src/backup.ts
@@ -45,7 +45,7 @@ import { type StorageAdapter } from '@hcengineering/server-core'
 import { fullTextPushStagePrefix } from '@hcengineering/server-indexer'
 import { generateToken } from '@hcengineering/server-token'
 import { connect } from '@hcengineering/server-tool'
-import { createReadStream, createWriteStream, existsSync, mkdirSync } from 'node:fs'
+import { createReadStream, createWriteStream, existsSync, mkdirSync, statSync } from 'node:fs'
 import { rm } from 'node:fs/promises'
 import { basename, dirname } from 'node:path'
 import { PassThrough } from 'node:stream'
@@ -178,7 +178,7 @@ async function loadDigest (
           result.delete(k as Ref<Doc>)
         }
       } catch (err: any) {
-        ctx.error('digest is broken, will do full backup for', { domain })
+        ctx.error('digest is broken, will do full backup for', { domain, err: err.message, snapshot })
       }
     }
     // Stop if stop date is matched and provided
@@ -236,14 +236,10 @@ async function verifyDigest (
                   blobs.set(bname, { doc, buffer: undefined })
                 } else {
                   blobs.delete(bname)
-                  const blob = doc as Blob
-
-                  if (blob.size === bf.length) {
-                    validDocs.add(name as Ref<Doc>)
-                  }
+                  validDocs.add(bname as Ref<Doc>)
                 }
               } else {
-                validDocs.add(name as Ref<Doc>)
+                validDocs.add(bname as Ref<Doc>)
               }
               next()
             })
@@ -265,10 +261,7 @@ async function verifyDigest (
                   sz = bf.length
                 }
 
-                // If blob size matches doc size, remove from requiredDocs
-                if (sz === bf.length) {
-                  validDocs.add(name as Ref<Doc>)
-                }
+                validDocs.add(name as Ref<Doc>)
               }
               next()
             })
@@ -364,7 +357,7 @@ async function verifyDigest (
         }
       } catch (err: any) {
         digestToRemove.add(snapshot)
-        ctx.error('digest is broken, will do full backup for', { domain })
+        ctx.error('digest is broken, will do full backup for', { domain, err: err.message, snapshot })
         modified = true
       }
     }
@@ -1490,6 +1483,7 @@ export async function backupSize (storage: BackupStorage): Promise<void> {
  */
 export async function backupDownload (storage: BackupStorage, storeIn: string): Promise<void> {
   const infoFile = 'backup.json.gz'
+  const sizeFile = 'backup.size.gz'
 
   if (!(await storage.exists(infoFile))) {
     throw new Error(`${infoFile} should present to restore`)
@@ -1499,15 +1493,24 @@ export async function backupDownload (storage: BackupStorage, storeIn: string):
   const backupInfo: BackupInfo = JSON.parse(gunzipSync(await storage.loadFile(infoFile)).toString())
   console.log('workspace:', backupInfo.workspace ?? '', backupInfo.version)
 
+  let sizeInfo: Record<string, number> = {}
+  if (await storage.exists(sizeFile)) {
+    sizeInfo = JSON.parse(gunzipSync(await storage.loadFile(sizeFile)).toString())
+  }
+  console.log('workspace:', backupInfo.workspace ?? '', backupInfo.version)
+
   const addFileSize = async (file: string | undefined | null, force: boolean = false): Promise<void> => {
     if (file != null) {
       const target = join(storeIn, file)
       const dir = dirname(target)
       if (!existsSync(dir)) {
         mkdirSync(dir, { recursive: true })
       }
-      if (!existsSync(target) || force) {
-        const fileSize = await storage.stat(file)
+
+      const serverSize: number | undefined = sizeInfo[file]
+
+      if (!existsSync(target) || force || (serverSize !== undefined && serverSize !== statSync(target).size)) {
+        const fileSize = serverSize ?? (await storage.stat(file))
         console.log('downloading', file, fileSize)
         const readStream = await storage.load(file)
         const outp = createWriteStream(target)
@@ -1781,7 +1784,7 @@ export async function restore (
 
       if (sendSize > dataUploadSize || (doc === undefined && docs.length > 0)) {
         totalSend += docs.length
-        ctx.info('upload', {
+        ctx.info('upload-' + c, {
           docs: docs.length,
           totalSend,
           from: docsToAdd.size + totalSend,