Skip to content

Add config option recursive=yes|no for each target #108

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
portavales wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add config option recursive=yes|no for each target #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 21 additions & 11 deletions pyznap/take.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from .process import DatasetBusyError, DatasetNotFoundError, DatasetExistsError


def take_snap(filesystem, _type):
def take_snap(filesystem, _type, recursive=True):
"""Takes a snapshot of type '_type'

Parameters
Expand All @@ -35,7 +35,7 @@ def take_snap(filesystem, _type):

logger.info('Taking snapshot {}@{:s}...'.format(filesystem, snapname(_type)))
try:
filesystem.snapshot(snapname=snapname(_type), recursive=True)
filesystem.snapshot(snapname=snapname(_type), recursive=recursive)
except (DatasetBusyError, DatasetExistsError) as err:
logger.error(err)
except CalledProcessError as err:
Expand Down Expand Up @@ -85,34 +85,38 @@ def take_filesystem(filesystem, conf):
for snaps in snapshots.values():
snaps.reverse()

recursive = True # Default to recursive snapshots
if 'recursive' in conf and conf['recursive'] is not None and conf['recursive'] == False:
recursive = False

if conf['yearly'] and (not snapshots['yearly'] or
snapshots['yearly'][0][1].year != now().year):
take_snap(filesystem, 'yearly')
take_snap(filesystem, 'yearly', recursive)

if conf['monthly'] and (not snapshots['monthly'] or
snapshots['monthly'][0][1].month != now().month or
now() - snapshots['monthly'][0][1] > timedelta(days=31)):
take_snap(filesystem, 'monthly')
take_snap(filesystem, 'monthly', recursive)

if conf['weekly'] and (not snapshots['weekly'] or
snapshots['weekly'][0][1].isocalendar()[1] != now().isocalendar()[1] or
now() - snapshots['weekly'][0][1] > timedelta(days=7)):
take_snap(filesystem, 'weekly')
take_snap(filesystem, 'weekly', recursive)

if conf['daily'] and (not snapshots['daily'] or
snapshots['daily'][0][1].day != now().day or
now() - snapshots['daily'][0][1] > timedelta(days=1)):
take_snap(filesystem, 'daily')
take_snap(filesystem, 'daily', recursive)

if conf['hourly'] and (not snapshots['hourly'] or
snapshots['hourly'][0][1].hour != now().hour or
now() - snapshots['hourly'][0][1] > timedelta(hours=1)):
take_snap(filesystem, 'hourly')
take_snap(filesystem, 'hourly', recursive)

if conf['frequent'] and (not snapshots['frequent'] or
snapshots['frequent'][0][1].minute != now().minute or
now() - snapshots['frequent'][0][1] > timedelta(minutes=1)):
take_snap(filesystem, 'frequent')
take_snap(filesystem, 'frequent', recursive)


def take_config(config):
Expand Down Expand Up @@ -164,9 +168,15 @@ def take_config(config):
else:
# Take recursive snapshot of parent filesystem
take_filesystem(children[0], conf)
# Take snapshot of all children that don't have all snapshots yet
for child in children[1:]:
take_filesystem(child, conf)

recursive = True
if 'recursive' in conf and conf['recursive'] is not None and conf['recursive'] == False:
recursive = False

if recursive == True:
# Take snapshot of all children that don't have all snapshots yet
for child in children[1:]:
take_filesystem(child, conf)
finally:
if ssh:
ssh.close()
4 changes: 3 additions & 1 deletion pyznap/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def read_config(path):
config = []
options = ['key', 'frequent', 'hourly', 'daily', 'weekly', 'monthly', 'yearly', 'snap', 'clean',
'dest', 'dest_keys', 'compress', 'exclude', 'raw_send', 'resume', 'dest_auto_create',
'retries', 'retry_interval']
'retries', 'retry_interval', 'recursive']

for section in parser.sections():
dic = {}
Expand Down Expand Up @@ -118,6 +118,8 @@ def read_config(path):
for i in value.split(',')]
elif option in ['retries', 'retry_interval']:
dic[option] = [int(i) for i in value.split(',')]
elif option in ['recursive']:
dic[option] = {'yes': True, 'no': False}.get(value.lower(), None)
# Pass through values recursively
for parent in config:
for child in config:
Expand Down