From d250d3c9f4a92c423b9271c82515f599798e4351 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 Feb 2020 21:28:15 -0500 Subject: [PATCH 01/15] spelling: explicitly --- lib/ZnapZend.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/ZnapZend.pm b/lib/ZnapZend.pm index 7a8d3f7a..5205de39 100644 --- a/lib/ZnapZend.pm +++ b/lib/ZnapZend.pm @@ -606,7 +606,7 @@ my $createSnapshot = sub { # for each dataset: if the property "enabled" is set to "off", set the # newly created snapshot for removal - my @dataSetsExplicitelyDisabled = (); + my @dataSetsExplicitlyDisabled = (); for my $dataSet (@dataSetList){ # get the value for org.znapzend property @@ -619,15 +619,15 @@ my $createSnapshot = sub { $prop = <$prop> || "on"; chomp($prop); if ( $prop eq 'off' ) { - push(@dataSetsExplicitelyDisabled, $dataSet . '@' . $snapshotSuffix); + push(@dataSetsExplicitlyDisabled, $dataSet . '@' . $snapshotSuffix); } } # remove the snapshots previously marked # removal here is non-recursive to allow for fine-grained control - if ( @dataSetsExplicitelyDisabled ){ - $self->zLog->info("Requesting removal of marked datasets: ". join( ", ", @dataSetsExplicitelyDisabled)); - $self->zZfs->destroySnapshots(@dataSetsExplicitelyDisabled, 0); + if ( @dataSetsExplicitlyDisabled ){ + $self->zLog->info("Requesting removal of marked datasets: ". join( ", ", @dataSetsExplicitlyDisabled)); + $self->zZfs->destroySnapshots(@dataSetsExplicitlyDisabled, 0); } } } From 9f94fc7827a054ac98ac82eb38ab9726144806c4 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 Feb 2020 21:30:47 -0500 Subject: [PATCH 02/15] spelling: invocation --- lib/ZnapZend/ZFS.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ZnapZend/ZFS.pm b/lib/ZnapZend/ZFS.pm index 55d8b6e5..e61f24e9 100644 --- a/lib/ZnapZend/ZFS.pm +++ b/lib/ZnapZend/ZFS.pm @@ -541,7 +541,7 @@ sub getDataSetProperties { } } } else { - # Assume a string, per usual invokation + # Assume a string, per usual invocation print STDERR "=== getDataSetProperties(): Is string...\n" if $self->debug; if ($self->lowmemRecurse && $recurse) { my $listds = $self->listDataSets(undef, $dataSet, $recurse); From a962c86be613e6169ef0de5c24ba4ad64ea36009 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 Feb 2020 21:32:37 -0500 Subject: [PATCH 03/15] spelling: necessary --- init/znapzend.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init/znapzend.service.in b/init/znapzend.service.in index 01af256b..7ffd01a0 100644 --- a/init/znapzend.service.in +++ b/init/znapzend.service.in @@ -9,7 +9,7 @@ EnvironmentFile=-/etc/default/znapzend ExecStart=@BINDIR@/znapzend $ZNAPZENDOPTIONS ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure -# might be neccessary on low power systems +# might be necessary on low power systems # Nice=19 # IOSchedulingClass=2 # IOSchedulingPriority=7 From d886edb02d71b26e14f97076c513c730972ae31b Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 Feb 2020 21:33:11 -0500 Subject: [PATCH 04/15] spelling: non-recursive --- t/zfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/zfs b/t/zfs index fce9f6d1..cdf0f577 100755 --- a/t/zfs +++ b/t/zfs @@ -344,7 +344,7 @@ for ($command){ } else { # Non-recursive, print the requested dataset of any type # unless constrained by non-snapshots explicitly -#print STDERR "=== zfs list : nonrecursive\n"; +#print STDERR "=== zfs list : non-recursive\n"; if ( $srcds =~ /@/ && $listsnaps < 0 ) { print STDERR "cannot open '$srcds': snapshot delimiter '\@' is not expected here\n"; exit 1; From 4215f231f12c2e59752fe820b3e7a0e1438b4e3d Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 Feb 2020 21:33:37 -0500 Subject: [PATCH 05/15] spelling: particular --- init/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init/README.md b/init/README.md index c1eeb2d8..4fdc3c93 100644 --- a/init/README.md +++ b/init/README.md @@ -29,7 +29,7 @@ for an example plist. ## Solaris/Illumos For solaris/illumos OSes you can tell configure to install a znapzend -service manifest into a partcular location (no default imposed) by +service manifest into a particular location (no default imposed) by calling configure with the option like ```--enable-svcinstall=/var/svc/manifest/site```. You can also define the service name (defaults to ```oep/znapzend```) From f44eb50643380e0a5778cf3a308cd8930b335aa5 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 Feb 2020 21:34:22 -0500 Subject: [PATCH 06/15] spelling: reboot --- bin/znapzend | 2 +- doc/znapzend.pod | 2 +- man/znapzend.1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/znapzend b/bin/znapzend index 517090ac..420f389e 100755 --- a/bin/znapzend +++ b/bin/znapzend @@ -357,7 +357,7 @@ them individually. =item * Sometimes a snapshot can not be destroyed because of some oracle zfs bug. -Only a reeboot seems to be able to fix this. So we just destroy the ones we +Only a reboot seems to be able to fix this. So we just destroy the ones we can destroy. Logging an error about the problem =back diff --git a/doc/znapzend.pod b/doc/znapzend.pod index 1d14a072..65381e2a 100644 --- a/doc/znapzend.pod +++ b/doc/znapzend.pod @@ -238,7 +238,7 @@ them individually. =item * Sometimes a snapshot can not be destroyed because of some oracle zfs bug. -Only a reeboot seems to be able to fix this. So we just destroy the ones we +Only a reboot seems to be able to fix this. So we just destroy the ones we can destroy. Logging an error about the problem =back diff --git a/man/znapzend.1 b/man/znapzend.1 index f5837cde..ec092f5c 100644 --- a/man/znapzend.1 +++ b/man/znapzend.1 @@ -371,7 +371,7 @@ The multi snapshot destroy syntax is not available. So stick to destroying them individually. .IP "\(bu" 4 Sometimes a snapshot can not be destroyed because of some oracle zfs bug. -Only a reeboot seems to be able to fix this. So we just destroy the ones we +Only a reboot seems to be able to fix this. So we just destroy the ones we can destroy. Logging an error about the problem .RE .RS 4 From c3c3243cac6a45865abe17bfbfc3731d5c9eba96 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 Feb 2020 21:34:37 -0500 Subject: [PATCH 07/15] spelling: running --- README.md | 2 +- bin/znapzend | 2 +- doc/znapzend.pod | 2 +- man/znapzend.1 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 82f4b7d9..a5b05da5 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ itself. Note that while recursive configurations are well supported to set up backup and retention policies for a whole dataset subtree under the dataset -to which you have applied explicit configuration, at this time pruning of +to which you have applied explicit configuration, at this time prunning of such trees ("I want every dataset under var except var/tmp") is not supported. You probably do not want to enable ZnapZend against the root datasets of your pools due to that, but would have to be more fine-grained in your setup. diff --git a/bin/znapzend b/bin/znapzend index 420f389e..83b5187f 100755 --- a/bin/znapzend +++ b/bin/znapzend @@ -186,7 +186,7 @@ do all changes to the filesystem except destroying old snapshots =item B<--logto>={BI|I} send logs out to either syslog or a logfile. Default is to send logs to -B when runing daemonized. When running in debug mode, the +B when running daemonized. When running in debug mode, the logs will go to STDERR by default. Examples: diff --git a/doc/znapzend.pod b/doc/znapzend.pod index 65381e2a..9dcd36f0 100644 --- a/doc/znapzend.pod +++ b/doc/znapzend.pod @@ -67,7 +67,7 @@ do all changes to the filesystem except destroying old snapshots =item B<--logto>={BI|I} send logs out to either syslog or a logfile. Default is to send logs to -B when runing daemonized. When running in debug mode, the +B when running daemonized. When running in debug mode, the logs will go to STDERR by default. Examples: diff --git a/man/znapzend.1 b/man/znapzend.1 index ec092f5c..ff7a46b2 100644 --- a/man/znapzend.1 +++ b/man/znapzend.1 @@ -199,7 +199,7 @@ do all changes to the filesystem except destroying old snapshots .IP "\fB\-\-logto\fR={\fBsyslog::\fR\fIfacility\fR|\fIfilepath\fR}" 4 .IX Item "--logto={syslog::facility|filepath}" send logs out to either syslog or a logfile. Default is to send logs to -\&\fBsyslog::daemon\fR when runing daemonized. When running in debug mode, the +\&\fBsyslog::daemon\fR when running daemonized. When running in debug mode, the logs will go to \s-1STDERR\s0 by default. .Sp Examples: From 49a3431e4b4b74dc55c45210bf4c6ebe8f73b9b6 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 Feb 2020 21:34:48 -0500 Subject: [PATCH 08/15] spelling: should --- lib/ZnapZend/Time.pm | 2 +- t/zfs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ZnapZend/Time.pm b/lib/ZnapZend/Time.pm index d4e665d9..7b2cb72a 100644 --- a/lib/ZnapZend/Time.pm +++ b/lib/ZnapZend/Time.pm @@ -239,7 +239,7 @@ sub checkTimeFormat { my $resultingTime = $self->$getSnapshotTimestamp("dummydataset\@$formattedTime", $timeFormat) or die "ERROR: timestamp format not valid. check your syntax\n"; - return $timeToCheck == $resultingTime; #times schould be equal + return $timeToCheck == $resultingTime; #times should be equal } sub getSnapshotFilter { diff --git a/t/zfs b/t/zfs index cdf0f577..fc47af63 100755 --- a/t/zfs +++ b/t/zfs @@ -129,7 +129,7 @@ sub find_attr_source { my $parentSource = find_attr_source($parentSourceName); if (!defined($parentSource) || $parentSource eq '-' || $parentSource eq 'default') { - return 'default'; #...or shoul we return $parentSource here? + return 'default'; #...or should we return $parentSource here? } if ($parentSource eq 'local' || $parentSource eq 'received') { From 30229308e6f5c8ff1cc51d0c30560b91cf1f0904 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 Feb 2020 21:35:06 -0500 Subject: [PATCH 09/15] spelling: specific --- lib/ZnapZend/ZFS.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ZnapZend/ZFS.pm b/lib/ZnapZend/ZFS.pm index e61f24e9..16ed6ed2 100644 --- a/lib/ZnapZend/ZFS.pm +++ b/lib/ZnapZend/ZFS.pm @@ -1080,7 +1080,7 @@ returns whether scrub is active on zpool or not =head2 usedBySnapshots -returns the amount of storage space used by snapshots of a sepcific dataset +returns the amount of storage space used by snapshots of a specific dataset =head1 COPYRIGHT From 9ffdea4639bef1758bc1fa8ba2e56016570ae622 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 Feb 2020 21:36:39 -0500 Subject: [PATCH 10/15] spelling: thinning --- packaging/checkinstall/description-pak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/checkinstall/description-pak b/packaging/checkinstall/description-pak index 30a616b7..f5694126 100644 --- a/packaging/checkinstall/description-pak +++ b/packaging/checkinstall/description-pak @@ -1,4 +1,4 @@ -ZnapZend is a ZFS centric backup tool. It relies on snapshot, send and receive todo its work. It has the built-in ability to to manage both local snapshots as well as remote copies by thining them out as time progresses. +ZnapZend is a ZFS centric backup tool. It relies on snapshot, send and receive todo its work. It has the built-in ability to to manage both local snapshots as well as remote copies by thinning them out as time progresses. The ZnapZend configuration is stored as properties in the ZFS filesystem itself. From f08ee29bde9f94d5c48f880b57f24832b6efddbf Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 Feb 2020 21:45:59 -0500 Subject: [PATCH 11/15] spelling: availability --- configure | 4 ++-- configure.ac | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 0722328f..0a31c143 100755 --- a/configure +++ b/configure @@ -2992,8 +2992,8 @@ fi done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnu make availablility" >&5 -$as_echo_n "checking for gnu make availablility... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnu make availability" >&5 +$as_echo_n "checking for gnu make availability... " >&6; } if ( $GMAKE --version 2> /dev/null | $GREP GNU > /dev/null 2>&1 ); then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMAKE is GNU make" >&5 $as_echo "$GMAKE is GNU make" >&6; } diff --git a/configure.ac b/configure.ac index b33eb311..b0a98ece 100644 --- a/configure.ac +++ b/configure.ac @@ -108,7 +108,7 @@ AC_PROG_GREP AC_ARG_VAR(GMAKE, [Path to local GNU Make binary]) AC_PATH_PROGS(GMAKE, [gnumake gmake make]) -AC_MSG_CHECKING([for gnu make availablility]) +AC_MSG_CHECKING([for gnu make availability]) if ( $GMAKE --version 2> /dev/null | $GREP GNU > /dev/null 2>&1 ); then AC_MSG_RESULT([$GMAKE is GNU make]) else From dec953b06b696300eb3c7790e2fce0a3881b20d7 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 Feb 2020 21:46:44 -0500 Subject: [PATCH 12/15] spelling: compilation --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a5b05da5..3fd23e61 100644 --- a/README.md +++ b/README.md @@ -26,8 +26,8 @@ the command is targeted at one dataset and impacts it and all its children, allowing to get a consistent point-in-time set of snapshots across multiple datasets. -Complilation Inztructionz -------------------------- +Compilation Inztructionz +------------------------ If your distribution does not provide a packaged version of znapzend, or if you want to get a custom-made copy of znapzend, you will need a compiler and From 829d62333b1fc67964385197b793ad5c2c0f994e Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 Feb 2020 21:48:14 -0500 Subject: [PATCH 13/15] spelling: pruning --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3fd23e61..be2d66aa 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ itself. Note that while recursive configurations are well supported to set up backup and retention policies for a whole dataset subtree under the dataset -to which you have applied explicit configuration, at this time prunning of +to which you have applied explicit configuration, at this time pruning of such trees ("I want every dataset under var except var/tmp") is not supported. You probably do not want to enable ZnapZend against the root datasets of your pools due to that, but would have to be more fine-grained in your setup. From 962b57906ed88dfa1d532a97b3b4988ce23aebcb Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 Feb 2020 21:48:54 -0500 Subject: [PATCH 14/15] spelling: specify --- bin/znapzendzetup | 2 +- doc/znapzendzetup.pod | 2 +- man/znapzendzetup.1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/znapzendzetup b/bin/znapzendzetup index 8f2b4eb1..d7acec1c 100755 --- a/bin/znapzendzetup +++ b/bin/znapzendzetup @@ -682,7 +682,7 @@ Specify the path to your copy of the mbuffer utility. =item B<--mbuffer>=I -Specifiy the path to your copy of the mbuffer utility and the port used +Specify the path to your copy of the mbuffer utility and the port used on the destination. Caution: znapzend will send the data directly from source mbuffer to destination mbuffer, thus data stream is B encrypted. diff --git a/doc/znapzendzetup.pod b/doc/znapzendzetup.pod index cf582e99..6936fe34 100644 --- a/doc/znapzendzetup.pod +++ b/doc/znapzendzetup.pod @@ -183,7 +183,7 @@ Specify the path to your copy of the mbuffer utility. =item B<--mbuffer>=I -Specifiy the path to your copy of the mbuffer utility and the port used +Specify the path to your copy of the mbuffer utility and the port used on the destination. Caution: znapzend will send the data directly from source mbuffer to destination mbuffer, thus data stream is B encrypted. diff --git a/man/znapzendzetup.1 b/man/znapzendzetup.1 index eac104d6..09006ff0 100644 --- a/man/znapzendzetup.1 +++ b/man/znapzendzetup.1 @@ -322,7 +322,7 @@ separator. Specify the path to your copy of the mbuffer utility. .IP "\fB\-\-mbuffer\fR=\fI/usr/bin/mbuffer:31337\fR" 4 .IX Item "--mbuffer=/usr/bin/mbuffer:31337" -Specifiy the path to your copy of the mbuffer utility and the port used +Specify the path to your copy of the mbuffer utility and the port used on the destination. Caution: znapzend will send the data directly from source mbuffer to destination mbuffer, thus data stream is \fBnot\fR encrypted. From ad2111fcff8eb1077c93d6fabbc9982dc4ee6cf3 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 Feb 2020 21:30:18 -0500 Subject: [PATCH 15/15] spelling: (en-US) initialize --- lib/ZnapZend/Time.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ZnapZend/Time.pm b/lib/ZnapZend/Time.pm index 7b2cb72a..6f1e3598 100644 --- a/lib/ZnapZend/Time.pm +++ b/lib/ZnapZend/Time.pm @@ -159,7 +159,7 @@ sub getSnapshotsToDestroy { my %timeslots; my @toDestroy; - #initialise with maximum time to keep backups since we run from old to new backups + #initialize with maximum time to keep backups since we run from old to new backups my $maxAge = (sort { $a<=>$b } keys %$timePlan)[-1]; for my $snapshot (@$snapshots){