Skip to content

Improve output when delete_snapshot is blocked by task #6

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
eherot wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Improve output when delete_snapshot is blocked by task #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c952c0
[utils/safe_to_snap] Show full details about blocking task
eherot Oct 24, 2022
b9d308a
[DeleteSnapshots] Make safe_to_snap == false error msg more accurate
eherot Oct 24, 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: 1 addition & 1 deletion curator/actions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1188,7 +1188,7 @@ def do_action(self):
):
raise exceptions.FailedExecution(
'Unable to delete snapshot(s) because a snapshot is in '
'state "IN_PROGRESS"')
'state "IN_PROGRESS" or other snapshot activity was detected')
try:
for snap in self.snapshot_list.snapshots:
self.loggit.info('Deleting snapshot {0}...'.format(snap))
Expand Down
8 changes: 4 additions & 4 deletions curator/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1196,15 +1196,14 @@ def find_snapshot_tasks(client):
:arg client: An :class:`opensearchpy.Opensearch` client object
:rtype: bool
"""
retval = False
tasklist = client.tasks.list()
for node in tasklist['nodes']:
for task in tasklist['nodes'][node]['tasks']:
activity = tasklist['nodes'][node]['tasks'][task]['action']
if 'snapshot' in activity:
LOGGER.debug('Snapshot activity detected: {0}'.format(activity))
retval = True
return retval
return tasklist['nodes'][node]['tasks'][task]
return False

def safe_to_snap(client, repository=None, retry_interval=120, retry_count=3):
"""
Expand All @@ -1229,7 +1228,8 @@ def safe_to_snap(client, repository=None, retry_interval=120, retry_count=3):
LOGGER.info(
'Snapshot already in progress: {0}'.format(in_progress))
elif ongoing_task:
LOGGER.info('Snapshot activity detected in Tasks API')
LOGGER.info(
'Snapshot activity detected in Tasks API: {0}'.format(ongoing_task))
LOGGER.info(
'Pausing {0} seconds before retrying...'.format(retry_interval))
time.sleep(retry_interval)
Expand Down