Skip to content

add "cleanup_only" configuration to skip snapshotting #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
phryneas wants to merge 3 commits into
base: master
Choose a base branch
from
Open

add "cleanup_only" configuration to skip snapshotting #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d097da5
add "cleanup_only" configuration to skip snapshotting
phryneas Feb 14, 2022
4e44156
fixup
phryneas Feb 14, 2022
95ac14f
fixup
phryneas Feb 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions bin/zfs-auto-snapshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,7 @@ datasets = find_eligible_datasets(interval, pool)
# Generate new snapshots
do_new_snapshots(datasets, interval) if keep > 0

datasets = find_eligible_datasets(interval, pool, ['cleanup_only'])

# Delete expired
cleanup_expired_snapshots(pool, datasets, interval, keep, should_destroy_zero_sized_snapshots)
11 changes: 6 additions & 5 deletions lib/zfstools.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,9 @@ def find_recursive_datasets(datasets)


### Find eligible datasets
def filter_datasets(datasets, included_excluded_datasets, property)
def filter_datasets(datasets, included_excluded_datasets, property, extra_eligible)
all_datasets = included_excluded_datasets['included'] + included_excluded_datasets['excluded']
eligible_values = ["true","mysql","postgresql"] + extra_eligible

datasets.each do |dataset|
# If the dataset is already included/excluded, skip it (for override checking)
Expand All @@ -115,15 +116,15 @@ def filter_datasets(datasets, included_excluded_datasets, property)
# Exclude unmounted datasets.
if (dataset.properties['mounted'] == "yes" or
dataset.properties['type'] == "volume") and
["true","mysql","postgresql"].include? value
eligible_values.include? value
included_excluded_datasets['included'] << dataset
elsif value
included_excluded_datasets['excluded'] << dataset
end
end
end

def find_eligible_datasets(interval, pool)
def find_eligible_datasets(interval, pool, extra_eligible = [])
properties = [
"#{snapshot_property}:#{interval}",
snapshot_property,
Expand All @@ -138,9 +139,9 @@ def find_eligible_datasets(interval, pool)
}

# Gather the datasets given the override property
filter_datasets datasets, included_excluded_datasets, "#{snapshot_property}:#{interval}"
filter_datasets datasets, included_excluded_datasets, "#{snapshot_property}:#{interval}", extra_eligible
# Gather all of the datasets without an override
filter_datasets datasets, included_excluded_datasets, snapshot_property
filter_datasets datasets, included_excluded_datasets, snapshot_property, extra_eligible

### Determine which datasets can be snapshotted recursively and which not
datasets = find_recursive_datasets included_excluded_datasets
Expand Down