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

dsnap-sync: refine btrfs quota-group handling

Browse Source 
- if qgroup usage is requested, need to check if it is already enabled
  if not, turn on this filesystem option an rescan for the given
  subvolume
- even rescanning and calculation the qgroup values might be faster
  for large subvolumes, than using plain 'du'
- just enable the qgroup usage for dsnap-sync runs. Upstream
  still encounters performance hits for regular production
  usage (v4.7: consult the wiki)
  this is controlled via enabling the global 'btrfs_quota_tmp' flag

Signed-off-by: Ralf Zerres <ralf.zerres@networkx.de>
This commit is contained in:
Ralf Zerres
2019-08-09 09:07:40 +02:00
parent 868c6d4a0a
commit 5c596500e1
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
bin/dsnap-sync
View File

@@ -50,6 +50,7 @@ answer=no
archive_type=full archive_type=full
batch=0 batch=0
btrfs_quota=0 btrfs_quota=0
btrfs_quota_tmp=1
#btrfs_verbose_flag=--verbose #btrfs_verbose_flag=--verbose
btrfs_verbose_flag= btrfs_verbose_flag=
color=0 color=0
@@ -1628,16 +1629,20 @@ run_backup () {
# qgroup identifiers conform to level/id where level 0 is reserved to the qgroups associated with subvolumes # qgroup identifiers conform to level/id where level 0 is reserved to the qgroups associated with subvolumes
snapper_source_snapshot_size=$(btrfs qgroup show -f --raw $snapper_source_snapshot 2>/dev/null \ snapper_source_snapshot_size=$(btrfs qgroup show -f --raw $snapper_source_snapshot 2>/dev/null \
| awk 'FNR>2 {print $2}') | awk 'FNR>2 {print $2}')
if [ $? -eq 1 ]; then
# subvolume is not configured for quota, (temporary?) enable that
if [ $btrfs_quota_tmp -eq 1 ]; then
btrfs quota enable $snapper_source_snapshot 2>/dev/null
btrfs quota rescan -w $snapper_source_snapshot 2>/dev/null
snapper_source_snapshot_size=$(btrfs qgroup show -f --raw $snapper_source_snapshot 2>/dev/null \
| awk 'FNR>2 {print $2}')
fi
fi
if [ $verbose -ge 3 ]; then if [ $verbose -ge 3 ]; then
printf "${MAGENTA}BTRFS qgroup show result: ${GREEN}'%s'\b${NO_COLOR}'%s'\n" \ printf "${MAGENTA}BTRFS qgroup show result: ${GREEN}'%s'\b${NO_COLOR}'%s'\n" \
"$?" "$snapper_source_snapshot_size" "$?" "$snapper_source_snapshot_size"
fi fi
#if [ $? -eq 1 ]; then
# subvolume is not configured for quota, (temporary?) enable that
#btrfs_quota_tmp=1
#btrfs quota enable $snapper_source_snapshot 2>/dev/null
#btrfs quota rescan -w $snapper_source_snapshot 2>/dev/null
#fi
# need to substitue btrfs 'x.yyGiB' suffix, since pv will need 'xG' # need to substitue btrfs 'x.yyGiB' suffix, since pv will need 'xG'
if [ $snapper_source_snapshot_size -ge 1048576 ]; then if [ $snapper_source_snapshot_size -ge 1048576 ]; then
@@ -1650,7 +1655,7 @@ run_backup () {
fi fi
# should we disable quota usage again? # should we disable quota usage again?
#if [ $btrfs_quota_tmp -eq 1 ]; then btrfs quota disable $snapper_source_snapshot; fi if [ $btrfs_quota_tmp -eq 1 ]; then btrfs quota disable $snapper_source_snapshot; fi
else else
snapper_source_snapshot_size=$(du --one-file-system --summarize $snapper_source_snapshot 2>/dev/null \ snapper_source_snapshot_size=$(du --one-file-system --summarize $snapper_source_snapshot 2>/dev/null \
| awk -F ' ' '{print $1}') | awk -F ' ' '{print $1}')