cyteen
/
sanoid
mirror of https://github.com/jimsalterjrs/sanoid
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

expanded debug output, fixed and greatly cleaned up config parsing in sanoid

This commit is contained in:
Jim Salter 2015-04-01 16:33:46 -04:00
parent e6fc2a6f46
commit 5b1a833dd9
3 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
sanoid
View File

@ -19,6 +19,9 @@ my $zfs = '/sbin/zfs';
my $conf_file = '/etc/sanoid/sanoid.conf';
my $default_conf_file = '/etc/sanoid/sanoid.defaults.conf';
# parse CLI arguments
my %args = getargs(@ARGV);
# parse config file
my %config = init($conf_file,$default_conf_file);
@ -34,8 +37,6 @@ my %snapsbypath = getsnapsbypath( \%config, \%snaps );
# let's make it a little easier to be consistent passing these hashes in the same order to each sub
my @params = ( \%config, \%snaps, \%snapsbytype, \%snapsbypath );
my %args = getargs(@ARGV);
if ($args{'debug'}) { $args{'verbose'}=1; blabber (@params); }
if ($args{'monitor-snapshots'}) { monitor_snapshots(@params); }
if ($args{'monitor-health'}) { monitor_health(@params); }
@ -343,9 +344,9 @@ sub blabber {
my ($config, $snaps, $snapsbytype, $snapsbypath) = @_;
#$Data::Dumper::Sortkeys = 1;
#print "****** CONFIGS ******\n";
#print Dumper(\%config);
$Data::Dumper::Sortkeys = 1;
print "****** CONFIGS ******\n";
print Dumper(\%config);
#print "****** SNAPSHOTS ******\n";
#print Dumper(\%snaps);
#print "****** SNAPSBYTYPE ******\n";
@ -520,7 +521,7 @@ sub init {
my ($conf_file, $default_conf_file) = @_;
my %config;
tie my %defaults, 'Config::IniFiles', ( -file => $default_conf_file );
tie my %defaults, 'Config::IniFiles', ( -file => $default_conf_file ) or die 'cannot load $conf_file - please restore a clean copy, this is not a user-editable file!';
tie my %ini, 'Config::IniFiles', ( -file => $conf_file );
# we'll use these later to normalize potentially true and false values on any toggle keys
@ -534,15 +535,21 @@ sub init {
# set default values from %defaults, which can then be overriden by template
# and/or local settings within the module.
foreach my $key (keys %defaults) {
$config{$section}{$key} = $defaults{$key};
foreach my $key (keys %{$defaults{'template_default'}}) {
if (! ($key =~ /template/)) {
if ($args{'debug'}) { print "INFO: setting $key on $section from $default_conf_file.\n"; }
$config{$section}{$key} = $defaults{'template_default'}{$key};
}
}
# override with values from user-defined default template, if any
foreach my $key (keys %{$ini{'template_default'}}) {
$config{$section}{$key} = $ini{'template_default'}{$key};
if (! ($key =~ /template/)) {
if ($args{'debug'}) { print "INFO: overriding $key on $section with value from user-defined default template.\n"; }
$config{$section}{$key} = $ini{'template_default'}{$key};
}
}
# override with values from user-defined templates applied to this module,
@ -552,14 +559,20 @@ sub init {
foreach my $rawtemplate (@templates) {
my $template = 'template_'.$rawtemplate;
foreach my $key (keys %{$ini{$template}}) {
$config{$section}{$key} = $ini{$template}{$key};
if (! ($key =~ /template/)) {
if ($args{'debug'}) { print "INFO: overriding $key on $section with value from user-defined template $template.\n"; }
$config{$section}{$key} = $ini{$template}{$key};
}
}
}
}
# override with any locally set values in the module itself
foreach my $key (keys %{ini{$section}} {
$config{$section}{$key} = $ini{$section}{$key};
foreach my $key (keys %{$ini{$section}} ) {
if (! ($key =~ /template/)) {
if ($args{'debug'}) { print "INFO: overriding $key on $section with value directly set in module.\n"; }
$config{$section}{$key} = $ini{$section}{$key};
}
}
# make sure that true values are true and false values are false for any toggled values
@ -573,8 +586,11 @@ sub init {
}
# section path is the section name, unless section path has been explicitly defined
$config{$section}{'path'} = $section;
if (defined $ini{$section}{'path'}) { $config{$section}{'path'} = $ini{$section}{'path'}; }
if (defined ($ini{$section}{'path'})) {
$config{$section}{'path'} = $ini{$section}{'path'};
} else {
$config{$section}{'path'} = $section;
}
}
return %config;

13
sanoid.conf
View File

@ -5,8 +5,10 @@
# name your backup modules with the path to their ZFS dataset - no leading slash.
[zpoolname/datasetname]
# pick a template - they're defined (and editable) below.
use_template = production
# pick one or more templates - they're defined (and editable) below. Comma separated, processed in order.
# in this example, template_demo's daily value overrides template_production's daily value.
use_template = production,demo
# if you want to, you can override settings in the template directly inside module definitions like this.
# in this example, we override the template to only keep 12 hourly and 1 monthly snapshot for this dataset.
hourly = 12
@ -18,8 +20,11 @@
#############################
# name your templates template_templatename. you can create your own, and use them in your module definitions above.
[template_demo]
daily = 60
[template_production]
template = yes
hourly = 36
daily = 30
monthly = 3
@ -28,8 +33,6 @@
autoprune = yes
[template_backup]
template = yes
autoprune = yes
hourly = 30
daily = 90

4
sanoid.defaults.conf
View File

@ -7,7 +7,6 @@
###################################################################################
[template_default]
template = yes
# If any snapshot type is set to 0, we will not take snapshots for it - and will immediately
# prune any of those type snapshots already present.
@ -38,7 +37,8 @@ monthly_mday = 1;
monthly_hour = 0;
monthly_min = 0;
# yearly - immediately at the beginning of the year (ie 00:00 on Jan 1)
yearly_yday = 1;
yearly_mon = 1;
yearly_mday = 1;
yearly_hour = 0;
yearly_min = 0;