Skip to content
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

Do not fail es-cleaner if there are no jaeger indices #1569

Merged
merged 1 commit into from
May 28, 2019
Merged

Do not fail es-cleaner if there are no jaeger indices #1569

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
Do not fail es-cleaner if there are no jaeger indices 
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
  • Loading branch information
@pavolloffay
pavolloffay committed May 27, 2019
commit 67030ad1aa8539d094d4228cfbe5904fcfc375d1
1 change: 1 addition & 0 deletions plugin/storage/es/esCleaner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ def main():

def filter_main_indices(ilo, prefix):
ilo.filter_by_regex(kind='prefix', value=prefix + "jaeger")
empty_list(ilo, "No indices to delete")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

empty_list function seems to kill the process if the list is empty (better name would be panic_if_list_empty)

so how does this achieve "do not fail" objective?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

empty_list ends the process with 0 which indicates success. This is exactly what we want. Without this fix the process is not ended and an exception is thrown.

# This excludes archive index as we use source='name'
# source `creation_date` would include archive index
ilo.filter_by_age(source='name', direction='older', timestring='%Y-%m-%d', unit='days', unit_count=int(sys.argv[1]))
Expand Down