From 097bec473caedcac8dd0d1fb80dc4778edbd0759 Mon Sep 17 00:00:00 2001
From: axelgobletbdr <40762710+axelgobletbdr@users.noreply.github.com>
Date: Wed, 28 Oct 2020 17:09:57 +0100
Subject: [PATCH] fixed bug in etcd retention where backups are not sorted by
date (#6860)
* fixed bug in etcd retention where backups are not sorted by date
* added directory filter to find command
---
roles/etcd/handlers/backup.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/roles/etcd/handlers/backup.yml b/roles/etcd/handlers/backup.yml
index aeaa2b5fb..6d2cc8bcb 100644
--- a/roles/etcd/handlers/backup.yml
+++ b/roles/etcd/handlers/backup.yml
@@ -62,5 +62,5 @@
- name: Remove old etcd backups
shell:
chdir: "{{ etcd_backup_prefix }}"
- cmd: "find . -name 'etcd-*' | head -n -{{ etcd_backup_retention_count }} | xargs rm -rf"
+ cmd: "find . -name 'etcd-*' -type d | sort -n | head -n -{{ etcd_backup_retention_count }} | xargs rm -rf"
when: etcd_backup_retention_count >= 0
--
GitLab