WebSVN – sysadmin_scripts – Diff – /trunk/zfs/snapshot/snapShot

 #       Initial Release
+#
 #    version 1.0.1 20220430 RWR
 #       Removed some debugging, set so it will always log the actions to /tmp/snapShot
+#
+#    version 1.0.2 20220529 RWR
+#       Fixed error where 86400 was mistyped 864000, replacing all instance of numbers other than 60 and 3600 with contants
+#       Added DEBUG flag in config which will turn on TESTING, the dump some additional information to screen during run
+#
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation, either version 3 of the License, or
 #    (at your option) any later version.
+#
 use strict;
 use warnings;
-use version; our $VERSION = version->declare( 'v1.0.1');
+use version; our $VERSION = version->declare( 'v1.0.2');
 use Data::Dumper;
 use Time::Local;
 use POSIX qw(strftime);
 use YAML::Tiny; # apt-get libyaml-tiny-perl under debian, BSD Systems: cpan -i YAML::Tiny
 use Hash::Merge::Simple qw/ merge clone_merge /; # apt install libhash-merge-simple-perl or cpan -i Hash::Merge::Simple
 # globals
 my $CONFIG_FILE_NAME = 'snapShot.yaml';
+my $SECONDS_PER_DAY = 86400;
+my $SECONDS_PER_WEEK = 7 * $SECONDS_PER_DAY;
+my $SECONDS_PER_MONTH = 30.5 * $SECONDS_PER_DAY;
+my $SECONDS_PER_YEAR = 365.2425 * $SECONDS_PER_DAY;
 # This will be read in from snapShot.yaml
 my $config;
+#
+      }
+   }
    return \%dataSets; # return all entries we are looking for
+}
-# will convert something like 1 day to the number of seconds (86400) for math.
+# will convert something like 1 day to the number of seconds ($SECONDS_PER_DAY) for math.
 # month and year are approximations (30.5 day = a month, 365.2425 days is a year)
 # For month and year, use the int function to convert back to integer
 sub period2seconds {
    my ($count, $unit) = ( shift =~ m/\s*(\d+)\s*([a-z]+)\s*/i );
    $unit = lc $unit;
    if ( $unit eq 'hour' ) {
       $count *= 3600;
    } elsif ( $unit eq 'day' ) {
-      $count *= 86400;
+      $count *= $SECONDS_PER_DAY;
    } elsif ( $unit eq 'week' ) {
-      $count *= 864000 * 7;
+      $count *= $SECONDS_PER_WEEK;
    } elsif ( $unit eq 'month' ) {
-      $count *= int( 864000 * 30.5 );
+      $count *= int( $SECONDS_PER_MONTH );
    } elsif ( $unit eq 'year' ) {
-      $count *= int( 86400 * 365.2425 );
+      $count *= int( $SECONDS_PER_YEAR );
    } else {
       die "Unknown units [$unit] in period2seconds\n";
+   }
    return $count;
+}
+# quick convert unix time stamp to YYYY-MM-DD HH:MM
+sub unix2Gregorian {
+   use POSIX qw(strftime);
+   my $timestamp = shift;
+   return strftime( "%F %R", $timestamp );
+}
+# just converts a number of seconds to days HH:MM:SS
+sub secondsToHuman {
+   my $seconds = shift;
+   my $days = int( $seconds / $SECONDS_PER_DAY );
+   $seconds -= $days * $SECONDS_PER_DAY;
+   my $hours = int( $seconds / 60);
+   $seconds -= $hours * 60;
+   my $minutes = int( $seconds / 60 );
+   $seconds -= $minutes * 60;
+   return printf( '%02d days %02:%02:%02', $days, $hours, $minutes, $seconds );
+}
 # Merges datasets, snapshots and some stuff from the configuration into the datasets
 # hash. After this, $config and $snapshots should no longer be necessary
 sub mergeData {
    my ($datasets,$snapshots,$config) = @_;
    my $confKeys = $config->{'datasets'};
    my ( $datasets, $now, $snapshotName, $slop ) = @_;
    my @toDelete; # will hold all the destroy commands
    my @toAdd; # will hold all the create commands
    foreach my $thisDataset ( keys %$datasets ) { # Look at each dataset/volume in turn
+      if ( $config->{'DEBUG'} ) {
+         print "Found Datasset $thisDataset\n";
+         print "\tRetention period set to " . &secondsToHuman( $datasets->{$thisDataset}->{'retention'} ) . "\n";
+         print "\tNext Snapshot due " .
+            &unix2Gregorian( $datasets->{$thisDataset}->{'lastSnap'} + $datasets->{$thisDataset}->{'frequency'} - $slop ) . "\n";
+      }
       # if any snapshots need to be destroyed, add them to @toDelete
       push( @toDelete,
          &checkRetention(
          $datasets->{$thisDataset}->{'retention'},
          $datasets->{$thisDataset}->{'recursive'},
+   }
    return 0; # we succeeded
+}
 &readConfig() or die "Could not read config file: $!\n";
+# if debug set, be sure testing is set also, so no actions are taken
+$config->{'TESTING'} = 1 if $config->{'DEBUG'};
 # we're pre-calculating some things so we don't do it over and over for each entry
 # grab the time once
 my $now = time;
 # create the string to be used for all snapshots, using $now and the template provided

Subversion Repositories sysadmin_scripts

(root)/trunk/zfs/snapshot/snapShot – Rev 107 → 119