rzerres/dsnap-sync
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

dsnap-sync: adapt ssh handling

Browse Source 
- on slow systems, multiple ssh calls in a row might fail without a
  suitable timegap. To overcome this, a short sleep doesn't hurt.

Signed-off-by: Ralf Zerres <ralf.zerres@networkx.de>
This commit is contained in:
Ralf Zerres
2018-12-21 15:46:17 +01:00
parent 07e9de0035
commit 2a9bc7e733
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bin/dsnap-sync
View File

@@ -576,22 +576,30 @@ get_disk_infos () {
| awk '{print $2}') | awk '{print $2}')
else else
# remote root filesystem will be excluded as a valid target location # remote root filesystem will be excluded as a valid target location
sleep 0.2
exclude_uuid=$($ssh findmnt --noheadings --nofsroot --mountpoint / --output UUID) exclude_uuid=$($ssh findmnt --noheadings --nofsroot --mountpoint / --output UUID)
sleep 0.2
disk_uuids=$($ssh "findmnt --noheadings --nofsroot --types btrfs --output UUID,TARGET --list \ disk_uuids=$($ssh "findmnt --noheadings --nofsroot --types btrfs --output UUID,TARGET --list \
| grep -v \"$exclude_uuid\" \ | grep -v \"$exclude_uuid\" \
| awk '{print \$1}'") | awk '{print \$1}'")
sleep 0.2
disk_targets=$($ssh "findmnt --noheadings --nofsroot --types btrfs --output UUID,TARGET --list \ disk_targets=$($ssh "findmnt --noheadings --nofsroot --types btrfs --output UUID,TARGET --list \
| grep -v \"$exclude_uuid\" \ | grep -v \"$exclude_uuid\" \
| awk '{print \$2}'") | awk '{print \$2}'")
sleep 0.2
fs_options=$($ssh "findmnt --noheadings --nofsroot --types btrfs --output UUID,OPTIONS --list \ fs_options=$($ssh "findmnt --noheadings --nofsroot --types btrfs --output UUID,OPTIONS --list \
| grep -v \"$exclude_uuid\" \ | grep -v \"$exclude_uuid\" \
| awk '{print \$2}'") | awk '{print \$2}'")
fi fi
else else
# target location is not mounted as root subvolume # target location is not mounted as root subvolume
sleep 0.2
disk_uuids=$($ssh findmnt --noheadings --nofsroot --types btrfs --output UUID --list) disk_uuids=$($ssh findmnt --noheadings --nofsroot --types btrfs --output UUID --list)
sleep 0.2
disk_targets=$($ssh findmnt --noheadings --nofsroot --types btrfs --output TARGET --list) disk_targets=$($ssh findmnt --noheadings --nofsroot --types btrfs --output TARGET --list)
sleep 0.2
fs_options=$($ssh findmnt --noheadings --nofsroot --types btrfs --output UUID,OPTIONS --list | awk '{print $2}') fs_options=$($ssh findmnt --noheadings --nofsroot --types btrfs --output UUID,OPTIONS --list | awk '{print $2}')
sleep 0.2
fi fi
# we need at least one target disk # we need at least one target disk