Prove direct cancellation during a pending sync

[onechat] / backup.go

diff --git a/backup.go b/backup.go
index 9398772ce8e0839fde894b2ce79320c4e3fc3739..c03e633df77666e161d9c636348bfb44977d0bee 100644 (file)
--- a/backup.go
+++ b/backup.go
@@ -37,7 +37,8 @@ func backup(ctx context.Context, path string, out io.Writer) (err error) {
        }()
 
        stop := context.AfterFunc(ctx, func() {
        }()
 
        stop := context.AfterFunc(ctx, func() {

-               _ = conn.Close()
+               // Cancellation closes the socket only to interrupt pending I/O.
+               conn.Close() // nolint: errcheck

        })
 
        defer stop()
        })
 
        defer stop()


@@ -93,42 +94,6 @@ func restore(ctx context.Context, path string, out io.Writer) error {
        return nil
 }
 
        return nil
 }
 

-// backupData stages a session snapshot, then copies the data under snapshot's
-// write locks. Compression runs after the locks are released.
-func backupData(ctx context.Context, dir, path string, whatsapp *WhatsApp, snapshot func(context.Context, func() error) error) (size int64, err error) {
-       if !filepath.IsAbs(path) {
-               return 0, errors.New("backup path must be absolute")
-       }
-
-       stage, err := os.MkdirTemp("", "onechat-backup-*")
-       if err != nil {
-               return 0, fmt.Errorf("create backup directory: %w", err)
-       }
-
-       defer func() {
-               err = errors.Join(err, os.RemoveAll(stage))
-       }()
-
-       err = whatsapp.BackupSession(ctx, filepath.Join(stage, whatsappDirName, whatsappSessionFileName))
-       if err != nil {
-               return 0, fmt.Errorf("copy WhatsApp session: %w", err)
-       }
-
-       err = snapshot(ctx, func() error {
-               return backupCopy(ctx, dir, stage, path)
-       })
-       if err != nil {
-               return 0, fmt.Errorf("copy data directory: %w", err)
-       }
-
-       size, err = backupArchive(ctx, stage, path)
-       if err != nil {
-               return 0, fmt.Errorf("archive backup: %w", err)
-       }
-
-       return size, nil
-}
-

 // backupRestore installs a validated archive into an empty data directory while
 // holding the token lock. It keeps the lock file so daemon starts use that same
 // inode, including after a failed restore.
 // backupRestore installs a validated archive into an empty data directory while
 // holding the token lock. It keeps the lock file so daemon starts use that same
 // inode, including after a failed restore.


@@ -205,6 +170,42 @@ func backupRestore(ctx context.Context, path, dir string) (err error) {
        return nil
 }
 
        return nil
 }
 

+// backupData stages a session snapshot, then copies the data under snapshot's
+// write locks. Compression runs after the locks are released.
+func backupData(ctx context.Context, dir, path string, whatsapp *WhatsApp, snapshot func(context.Context, func() error) error) (size int64, err error) {
+       if !filepath.IsAbs(path) {
+               return 0, errors.New("backup path must be absolute")
+       }
+
+       stage, err := os.MkdirTemp("", "onechat-backup-*")
+       if err != nil {
+               return 0, fmt.Errorf("create backup directory: %w", err)
+       }
+
+       defer func() {
+               err = errors.Join(err, os.RemoveAll(stage))
+       }()
+
+       err = whatsapp.BackupSession(ctx, filepath.Join(stage, whatsappDirName, whatsappSessionFileName))
+       if err != nil {
+               return 0, fmt.Errorf("copy WhatsApp session: %w", err)
+       }
+
+       err = snapshot(ctx, func() error {
+               return backupCopy(ctx, dir, stage, path)
+       })
+       if err != nil {
+               return 0, fmt.Errorf("copy data directory: %w", err)
+       }
+
+       size, err = backupArchive(ctx, stage, path)
+       if err != nil {
+               return 0, fmt.Errorf("archive backup: %w", err)
+       }
+
+       return size, nil
+}
+

 // backupCopy stages regular files and directories, excluding runtime files, the
 // output archive, and raw session database files. Each file keeps its mode.
 func backupCopy(ctx context.Context, source, target, output string) error {
 // backupCopy stages regular files and directories, excluding runtime files, the
 // output archive, and raw session database files. Each file keeps its mode.
 func backupCopy(ctx context.Context, source, target, output string) error {