Attachment 212053 Details for Bug 244465 – New patch to add -v, -n & -m<minfree> options to "zfs snapshot"

[patch] New patch to add -v, -n & -m<minfree> options to "zfs snapshot"

zfs-snapshot-minfree-freebsd.patch (text/plain), 4.67 KB, created by Peter Eriksson on 2020-02-29 21:30:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Eriksson

Created: 2020-02-29 21:30:36 UTC

Size: 4.67 KB

patch

obsolete

>--- zfs_main.c.MASTER	2020-02-29 15:16:36.352307346 +0100
>+++ zfs_main.c	2020-02-29 15:54:58.348130567 +0100
>@@ -327,8 +327,9 @@
> 	case HELP_SHARE:
> 		return (gettext("\tshare [-l] <-a [nfs|smb] | filesystem>\n"));
> 	case HELP_SNAPSHOT:
>-		return (gettext("\tsnapshot|snap [-r] [-o property=value] ... "
>-		    "<filesystem|volume>@<snap> ...\n"));
>+		return (gettext("\tsnapshot|snap [-n] [-v] [-r] "
>+		    "[-m minfree] [-o property=value]... "
>+		    "... <filesystem|volume>@<snap> ...\n"));
> 	case HELP_UNMOUNT:
> 		return (gettext("\tunmount [-fu] "
> 		    "<-a | filesystem|mountpoint>\n"));
>@@ -4076,6 +4077,9 @@
> 	nvlist_t *sd_nvl;
> 	boolean_t sd_recursive;
> 	const char *sd_snapname;
>+	uint64_t sd_min_avail;
>+	boolean_t sd_verbose;
>+	boolean_t sd_no_update;
> } snap_cbdata_t;
> 
> static int
>@@ -4085,6 +4089,7 @@
> 	char *name;
> 	int rv = 0;
> 	int error;
>+	uint64_t avail;
> 
> 	if (sd->sd_recursive &&
> 	    zfs_prop_get_int(zhp, ZFS_PROP_INCONSISTENT) != 0) {
>@@ -4092,20 +4097,34 @@
> 		return (0);
> 	}
> 
>-	error = asprintf(&name, "%s@%s", zfs_get_name(zhp), sd->sd_snapname);
>-	if (error == -1)
>-		nomem();
>-	fnvlist_add_boolean(sd->sd_nvl, name);
>-	free(name);
>+	if (!sd->sd_min_avail ||
>+	    (avail = zfs_prop_get_int(zhp,
>+	    ZFS_PROP_AVAILABLE)) >= sd->sd_min_avail) {
>+
>+		error = asprintf(&name, "%s@%s",
>+		    zfs_get_name(zhp), sd->sd_snapname);
>+		if (error == -1)
>+			nomem();
>+		fnvlist_add_boolean(sd->sd_nvl, name);
>+		free(name);
> 
>+	} else if (sd->sd_verbose) {
>+		fprintf(stderr,
>+		    gettext("skipping snapshot of '%s'"
>+		    ": avail (%llu) too low (< %llu)\n"),
>+		    zfs_get_name(zhp),
>+		    (unsigned long long) avail,
>+		    (unsigned long long) sd->sd_min_avail);
>+	}
> 	if (sd->sd_recursive)
> 		rv = zfs_iter_filesystems(zhp, zfs_snapshot_cb, sd);
>+
> 	zfs_close(zhp);
> 	return (rv);
> }
> 
> /*
>- * zfs snapshot [-r] [-o prop=value] ... <fs@snap>
>+ * zfs snapshot [-v] [-n] [-r] [-o prop=value] [-m minfree] ... <fs@snap>
>  *
>  * Creates a snapshot with the given name.  While functionally equivalent to
>  * 'zfs create', it is a separate command to differentiate intent.
>@@ -4118,14 +4137,20 @@
> 	nvlist_t *props;
> 	snap_cbdata_t sd = { 0 };
> 	boolean_t multiple_snaps = B_FALSE;
>+	char pfx;
>+	unsigned long avail = 0;
> 
> 	if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0)
> 		nomem();
> 	if (nvlist_alloc(&sd.sd_nvl, NV_UNIQUE_NAME, 0) != 0)
> 		nomem();
> 
>+	sd.sd_min_avail = 0;
>+	sd.sd_verbose = 0;
>+	sd.sd_no_update = 0;
>+
> 	/* check options */
>-	while ((c = getopt(argc, argv, "ro:")) != -1) {
>+	while ((c = getopt(argc, argv, "nvro:m:")) != -1) {
> 		switch (c) {
> 		case 'o':
> 			if (!parseprop(props, optarg)) {
>@@ -4134,10 +4159,46 @@
> 				return (1);
> 			}
> 			break;
>+		case 'n':
>+			sd.sd_no_update = 1;
>+			break;
>+		case 'v':
>+			sd.sd_verbose = 1;
>+			break;
> 		case 'r':
> 			sd.sd_recursive = B_TRUE;
> 			multiple_snaps = B_TRUE;
> 			break;
>+		case 'm':
>+			pfx = 0;
>+			if (!optarg ||
>+			    sscanf(optarg, "%lu%c",
>+			    &avail, &pfx) < 1) {
>+				(void) fprintf(stderr,
>+				    gettext("invalid minfree '%s'"), optarg);
>+				goto usage;
>+			}
>+			sd.sd_min_avail = avail;
>+			switch (toupper(pfx)) {
>+			case 'K':
>+				sd.sd_min_avail *= 1000;
>+				break;
>+			case 'M':
>+				sd.sd_min_avail *= 1000000;
>+				break;
>+			case 'G':
>+				sd.sd_min_avail *= 1000000000;
>+				break;
>+			case 'T':
>+				sd.sd_min_avail *= 1000000000000;
>+				break;
>+			default:
>+				(void) fprintf(stderr,
>+				    gettext("invalid minfree suffix '%s'"),
>+				    optarg);
>+				goto usage;
>+			}
>+			break;
> 		case '?':
> 			(void) fprintf(stderr, gettext("invalid option '%c'\n"),
> 			    optopt);
>@@ -4173,7 +4234,10 @@
> 			goto usage;
> 	}
> 
>-	ret = zfs_snapshot_nvl(g_zfs, sd.sd_nvl, props);
>+	ret = 0;
>+	if (!sd.sd_no_update && !nvlist_empty(sd.sd_nvl))
>+		ret = zfs_snapshot_nvl(g_zfs, sd.sd_nvl, props);
>+
> 	nvlist_free(sd.sd_nvl);
> 	nvlist_free(props);
> 	if (ret != 0 && multiple_snaps)
>--- zfs.8.RELEASE	2020-02-29 22:23:54.506084000 +0100
>+++ zfs.8	2020-02-29 22:27:07.051912000 +0100
>@@ -72,6 +72,9 @@
> .Nm
> .Cm snapshot Ns | Ns Cm snap
> .Op Fl r
>+.Op Fl n
>+.Op Fl v
>+.Op Fl m Ar minfree
> .Oo Fl o Ar property Ns = Ns Ar value Oc Ns ...
> .Ar filesystem@snapname Ns | Ns Ar volume@snapname
> .Ar filesystem@snapname Ns | Ns Ar volume@snapname Ns ...
>@@ -1929,6 +1932,14 @@
> .Nm
> .Cm snapshot Ns | Ns Cm snap
> .Op Fl r
>+.Oo Fl m Ar minfree
>+Set a limit on the minimum free space available for
>+snapshots to be taken. Size suffixes (K, M, G or T) can
>+be used.
>+.Oo Fl n
>+Do a dry-run (do not actually create any snapshots).
>+.Oo Fl v
>+Be more verbose (list snapshots skipped due to minfree).
> .Oo Fl o Ar property Ns = Ns Ar value Oc Ns ...
> .Ar filesystem@snapname Ns | Ns volume@snapname
> .Ar filesystem@snapname Ns | Ns volume@snapname Ns ...

Actions: View | Diff

Attachments on bug 244465: 212018 | 212053