From 520764f0f8a06ae36af0ae5f730cf05b227e8ccb Mon Sep 17 00:00:00 2001
From: Adam Thorn <alt36@cam.ac.uk>
Date: Wed, 9 Mar 2022 15:19:40 +0000
Subject: [PATCH] Set TASKNAME correctly in send-backup-to-server.sh
---
ROOT/DEBIAN/control | 2 +-
ROOT/usr/lib/chem-zfs-backup-server/send-backup-to-server.sh | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/ROOT/DEBIAN/control b/ROOT/DEBIAN/control
index 4017a72..e950729 100644
--- a/ROOT/DEBIAN/control
+++ b/ROOT/DEBIAN/control
@@ -3,6 +3,6 @@ Priority: optional
Section: otherosfs
Maintainer: Chemistry COs <support@ch.cam.ac.uk>
Architecture: all
-Version: 0.9-ch90
+Version: 0.9-ch91
Depends: zfs-dkms, postgresql-13 | postgresql-9.5 | postgresql-9.4 , liblockfile-simple-perl, libdbi-perl, libjson-perl, libzfs-perl-chem, libnet-openssh-perl, libdbd-pg-perl, mbuffer, rsync, nfs-kernel-server, pv, libwww-curl-perl
Description: a backup system using ZFS (repository 'backup-scheduler')
diff --git a/ROOT/usr/lib/chem-zfs-backup-server/send-backup-to-server.sh b/ROOT/usr/lib/chem-zfs-backup-server/send-backup-to-server.sh
index 8ddd99b..bea575b 100755
--- a/ROOT/usr/lib/chem-zfs-backup-server/send-backup-to-server.sh
+++ b/ROOT/usr/lib/chem-zfs-backup-server/send-backup-to-server.sh
@@ -143,6 +143,8 @@ for TASK_ID in $TASK_IDS; do
SOURCEDIR=$(dosql_local "select directory_source from zfs_rsync_detail where backup_task_id='$TASK_ID'")
SOFT=$(dosql_local "select timeout_soft from backup_task where backup_task_id='$TASK_ID'")
HARD=$(dosql_local "select timeout_hard from backup_task where backup_task_id='$TASK_ID'")
+
+ TASKNAME=$(dosql_local "select backup_task_name from backup_task where backup_task_id='$TASK_ID'")
CURRENT_ZFS_TARGET=$(dosql_local "select zfs_target from backup_task where backup_task_id='$TASK_ID'")
NEW_ZFS_TARGET=${ZPOOL_TARGET}/$(echo $CURRENT_ZFS_TARGET | cut -d '/' -f 2-)
--
GitLab