svn commit: r368514 - in stable/12: share/man/man5 usr.sbin/periodic usr.sbin/periodic/etc/daily
Gordon Bergling
gbe at FreeBSD.org
Thu Dec 10 13:25:46 UTC 2020
Author: gbe (doc committer)
Date: Thu Dec 10 13:25:45 2020
New Revision: 368514
URL: https://svnweb.freebsd.org/changeset/base/368514
Log:
MFC r367436 and r367443 by rew:
r367436
Add a periodic script to backup output generated from `zfs list`, `zfs get`,
`zpool list`, and `zpool get` commands.
Disabled by default.
r367443
Add a periodic script to backup output generated from `gmirror list`.
Disabled by default.
PR: 86388
Submitted by: Miroslav Lachman <000 dot fbsd at quip dot cz>
Reported by: Seklecki <Seklecki at FreeBSD dot org>
Reviewed by: allanjude, 0mp, gbe
Event: July 2020 Bugathon
Differential Revision: https://reviews.freebsd.org/D25638
Differential Revision: https://reviews.freebsd.org/D25631
Added:
stable/12/usr.sbin/periodic/etc/daily/222.backup-gmirror
- copied unchanged from r367443, head/usr.sbin/periodic/etc/daily/222.backup-gmirror
stable/12/usr.sbin/periodic/etc/daily/223.backup-zfs
- copied unchanged from r367436, head/usr.sbin/periodic/etc/daily/223.backup-zfs
Modified:
stable/12/share/man/man5/periodic.conf.5
stable/12/usr.sbin/periodic/etc/daily/Makefile
stable/12/usr.sbin/periodic/periodic.conf
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/share/man/man5/periodic.conf.5
==============================================================================
--- stable/12/share/man/man5/periodic.conf.5 Thu Dec 10 13:11:52 2020 (r368513)
+++ stable/12/share/man/man5/periodic.conf.5 Thu Dec 10 13:25:45 2020 (r368514)
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd September 9, 2020
+.Dd November 7, 2020
.Dt PERIODIC.CONF 5
.Os
.Sh NAME
@@ -257,6 +257,20 @@ as configured in
Set to
.Dq Li YES
to create backup of EFI System Partition (ESP).
+.It Va daily_backup_gmirror_enable
+.Pq Vt bool
+Set to
+.Dq Li YES
+to create backup of gmirror information (i.e., output of
+.Nm gmirror Cm list ) ,
+see
+.Xr gmirror 8 .
+.It Va daily_backup_gmirror_verbose
+.Pq Vt bool
+Set to
+.Dq Li YES
+to report a diff between the new backup and the existing backup
+in the daily output.
.It Va daily_backup_gpart_enable
.Pq Vt bool
Set to
@@ -289,6 +303,57 @@ Set to
if you want the
.Pa /etc/mail/aliases
file backed up and modifications to be displayed in your daily output.
+.It Va daily_backup_zfs_enable
+.Pq Vt bool
+Set to
+.Dq Li YES
+to create backup of the output generated from the
+.Xr zfs-list 8
+and
+.Xr zpool-list 8
+utilities.
+.It Va daily_backup_zfs_list_flags
+.Pq Vt str
+Set to the arguments for the
+.Xr zfs-list 8
+utility.
+The default is standard behavior.
+.It Va daily_backup_zpool_list_flags
+.Pq Vt str
+Set to the arguments for the
+.Xr zpool-list 8
+utility.
+The default is
+.Fl v .
+.It Va daily_backup_zfs_props_enable
+.Pq Vt bool
+Set to
+.Dq Li YES
+to create backup of the output generated from the
+.Xr zfs-get 8
+and
+.Xr zpool-get 8
+utilities.
+.It Va daily_backup_zfs_get_flags
+.Pq Vt str
+Set to the arguments for the
+.Xr zfs-get 8
+utility.
+The default is
+.Cm all .
+.It Va daily_backup_zpool_get_flags
+.Pq Vt str
+Set to the arguments for the
+.Xr zpool-get 8
+utility.
+The default is
+.Cm all .
+.It Va daily_backup_zfs_verbose
+.Pq Vt bool
+Set to
+.Dq Li YES
+to report a diff between the new backup and the existing backup
+in the daily output.
.It Va daily_calendar_enable
.Pq Vt bool
Set to
Copied: stable/12/usr.sbin/periodic/etc/daily/222.backup-gmirror (from r367443, head/usr.sbin/periodic/etc/daily/222.backup-gmirror)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/12/usr.sbin/periodic/etc/daily/222.backup-gmirror Thu Dec 10 13:25:45 2020 (r368514, copy of r367443, head/usr.sbin/periodic/etc/daily/222.backup-gmirror)
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+# $FreeBSD$
+# Created by: Miroslav Lachman <000.fbsd at quip.cz>
+
+# Backup output from `gmirror list`, which provides detailed information
+# of all gmirrors. The backup will be stored in /var/backups/.
+
+# If there is a global system configuration file, suck it in.
+#
+if [ -r /etc/defaults/periodic.conf ]
+then
+ . /etc/defaults/periodic.conf
+ source_periodic_confs
+fi
+
+bak_dir=/var/backups
+
+rotate() {
+ base_name=$1
+ show_diff=$2
+ file="$bak_dir/$base_name"
+
+ if [ -f "${file}.bak" ]; then
+ rc=0
+ if cmp -s "${file}.bak" "${file}.tmp"; then
+ rm "${file}.tmp"
+ else
+ rc=1
+ [ -n "$show_diff" ] && diff "${file}.bak" "${file}.tmp"
+ mv "${file}.bak" "${file}.bak2" || rc=3
+ mv "${file}.tmp" "${file}.bak" || rc=3
+ fi
+ else
+ rc=1
+ mv "${file}.tmp" "${file}.bak" || rc=3
+ [ -n "$show_diff" ] && cat "${file}.bak"
+ fi
+}
+
+case "$daily_backup_gmirror_verbose" in
+ [Yy][Ee][Ss]) show="YES"
+esac
+
+case "$daily_backup_gmirror_enable" in
+ [Yy][Ee][Ss])
+
+ gmirrors=$(gmirror status 2> /dev/null | \
+ awk '$1 ~ /^mirror\// { sub(/mirror\//, ""); print $1 }')
+
+ if [ -z "$gmirrors" ]; then
+ echo ""
+ echo "daily_backup_gmirror_enable is set to YES but no gmirrors found."
+ rc=2
+ else
+ echo ""
+ echo "Backup of gmirror information for:";
+
+ for m in ${gmirrors}; do
+ echo "$m"
+ safe_name=$(echo "gmirror.${m}" | tr -cs ".[:alnum:]\n" "_")
+ if ! gmirror status -s "${m}" | grep -F -v "COMPLETE"; then
+ gmirror list "${m}" > "$bak_dir/$safe_name.tmp"
+ rotate "$safe_name" $show
+ fi
+ done
+ fi
+ ;;
+ *) rc=0;;
+esac
+
+exit $rc
Copied: stable/12/usr.sbin/periodic/etc/daily/223.backup-zfs (from r367436, head/usr.sbin/periodic/etc/daily/223.backup-zfs)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/12/usr.sbin/periodic/etc/daily/223.backup-zfs Thu Dec 10 13:25:45 2020 (r368514, copy of r367436, head/usr.sbin/periodic/etc/daily/223.backup-zfs)
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# $FreeBSD$
+# Created by: Miroslav Lachman <000.fbsd at quip.cz>
+
+# Backup of zpool list, zfs list, zpool properties and zfs properties
+# for each filesystem. The backup will be stored in /var/backups.
+
+# If there is a global system configuration file, suck it in.
+#
+if [ -r /etc/defaults/periodic.conf ]
+then
+ . /etc/defaults/periodic.conf
+ source_periodic_confs
+fi
+
+bak_dir=/var/backups
+
+rotate() {
+ base_name=$1
+ show_diff=$2
+ file="$bak_dir/$base_name"
+
+ if [ -f "${file}.bak" ] ; then
+ rc=0
+ if cmp -s "${file}.bak" "${file}.tmp"; then
+ rm "${file}.tmp"
+ else
+ rc=1
+ [ -n "$show_diff" ] && diff "${file}.bak" "${file}.tmp"
+ mv "${file}.bak" "${file}.bak2" || rc=3
+ mv "${file}.tmp" "${file}.bak" || rc=3
+ fi
+ else
+ rc=1
+ mv "${file}.tmp" "${file}.bak" || rc=3
+ [ -n "$show_diff" ] && cat "${file}.bak"
+ fi
+}
+
+case "$daily_backup_zfs_verbose" in
+ [Yy][Ee][Ss]) show="YES"
+esac
+
+case "$daily_backup_zfs_enable" in
+ [Yy][Ee][Ss])
+
+ zpools=$(zpool list $daily_backup_zpool_list_flags)
+
+ if [ -z "$zpools" ]; then
+ echo 'daily_backup_zfs_enable is set to YES but no zpools found.'
+ rc=2
+ else
+ echo ""
+ echo "Backup of ZFS information for all imported pools";
+
+ echo "$zpools" > "$bak_dir/zpool_list.tmp"
+ rotate "zpool_list" $show
+
+ zfs list $daily_backup_zfs_list_flags > "$bak_dir/zfs_list.tmp"
+ rotate "zfs_list" $show
+ fi
+ ;;
+ *) rc=0;;
+esac
+
+case "$daily_backup_zfs_props_enable" in
+ [Yy][Ee][Ss])
+
+ zfs get $daily_backup_zfs_get_flags > "$bak_dir/zfs_props.tmp"
+ rotate "zfs_props"
+
+ zpool get $daily_backup_zpool_get_flags > "$bak_dir/zpool_props.tmp"
+ rotate "zpool_props"
+ ;;
+esac
+
+exit $rc
Modified: stable/12/usr.sbin/periodic/etc/daily/Makefile
==============================================================================
--- stable/12/usr.sbin/periodic/etc/daily/Makefile Thu Dec 10 13:11:52 2020 (r368513)
+++ stable/12/usr.sbin/periodic/etc/daily/Makefile Thu Dec 10 13:25:45 2020 (r368514)
@@ -10,6 +10,7 @@ CONFS= 100.clean-disks \
140.clean-rwho \
200.backup-passwd \
210.backup-aliases \
+ 222.backup-gmirror \
330.news \
400.status-disks \
401.status-graid \
@@ -54,7 +55,8 @@ CONFS+= 150.clean-hoststat \
.endif
.if ${MK_ZFS} != "no"
-CONFS+= 404.status-zfs \
+CONFS+= 223.backup-zfs \
+ 404.status-zfs \
800.scrub-zfs
.endif
Modified: stable/12/usr.sbin/periodic/periodic.conf
==============================================================================
--- stable/12/usr.sbin/periodic/periodic.conf Thu Dec 10 13:11:52 2020 (r368513)
+++ stable/12/usr.sbin/periodic/periodic.conf Thu Dec 10 13:25:45 2020 (r368514)
@@ -79,8 +79,21 @@ daily_backup_aliases_enable="YES" # Backup mail alia
# 221.backup-gpart
daily_backup_gpart_enable="YES" # Backup partition table/boot partition/MBR
-daily_backup_gpart_verbose="NO" # Be verbose if new backup differs from the new one
+daily_backup_gpart_verbose="NO" # Be verbose if new backup differs from the old one
daily_backup_efi_enable="NO" # Backup EFI system partition (ESP)
+
+# 222.backup-gmirror
+daily_backup_gmirror_enable="NO" # Backup of gmirror info (i.e., output of `gmirror list`)
+daily_backup_gmirror_verbose="NO" # Log diff if new backup differs from the old one
+
+# 223.backup-zfs
+daily_backup_zfs_enable="NO" # Backup output from zpool/zfs list
+daily_backup_zfs_props_enable="NO" # Backup zpool/zfs filesystem properties
+daily_backup_zfs_get_flags="all" # flags passed to `zfs get`
+daily_backup_zfs_list_flags="" # flags passed to `zfs list`
+daily_backup_zpool_get_flags="all" # flags passed to `zpool get`
+daily_backup_zpool_list_flags="-v" # flags passed to `zpool list`
+daily_backup_zfs_verbose="NO" # Report diff between the old and new backups.
# 300.calendar
daily_calendar_enable="NO" # Run calendar -a
More information about the svn-src-stable-12
mailing list