From 0f343a83156bcd058da32cb8c7fe00d3ef77dfcf Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <dmitriy.rabotyagov@cleura.com>
Date: Thu, 20 Apr 2023 14:09:16 +0200
Subject: [PATCH] Define backup randomized delay in defaults

Omit can not be used in timer options, since this is simple mapping
that is passed to the unit file. With that, omit is resolved to a
randomly named omit_place_holder  that ends up in a template.

Se we define a delay to 0, which is default systemd behaviour [1]

[1] https://www.freedesktop.org/software/systemd/man/systemd.timer.html#RandomizedDelaySec=

Change-Id: Ib242e66cfb4a24b7e93144e382e50f124015e3bf
(cherry picked from commit 92b5711b94d734d77665875bb99deb09cda72b25)
---
 defaults/main.yml               | 5 +++--
 tasks/galera_server_backups.yml | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index d2eb99a8..2361f9f3 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -307,12 +307,13 @@ galera_mariadb_backups_group_name: backups
 galera_mariadb_backups_path: "/var/backup/mariadb_backups"
 galera_mariadb_backups_full_copies: 2
 galera_mariadb_backups_full_on_calendar: "*-*-* 00:00:00"
-#galera_mariadb_backups_full_randomized_delay_sec: <timespan to randomize the full backup timer by>
+galera_mariadb_backups_full_randomized_delay_sec: 0
+
 galera_mariadb_backups_increment_on_calendar:
   - "*-*-* 06:00:00"
   - "*-*-* 12:00:00"
   - "*-*-* 18:00:00"
-#galera_mariadb_backups_incremental_randomized_delay_sec: <timespan to randomize the incremental backup timer by>
+galera_mariadb_backups_increment_randomized_delay_sec: 0
 #galera_mariadb_backups_user is the name of the mariadb database user
 galera_mariadb_backups_user: galera_mariadb_backup
 galera_mariadb_backups_suffix: "{{ inventory_hostname }}"
diff --git a/tasks/galera_server_backups.yml b/tasks/galera_server_backups.yml
index 108ee7d1..940c0e2e 100644
--- a/tasks/galera_server_backups.yml
+++ b/tasks/galera_server_backups.yml
@@ -48,7 +48,7 @@
           state: "started"
           options:
             OnCalendar: "{{ galera_mariadb_backups_full_on_calendar }}"
-            RandomizedDelaySec: "{{ galera_mariadb_backups_full_randomized_delay_sec | default(omit) }}"
+            RandomizedDelaySec: "{{ galera_mariadb_backups_full_randomized_delay_sec }}"
             Persistent: true
             Unit: "mariabackup-full.service"
 
@@ -75,7 +75,7 @@
           state: "started"
           options:
             OnCalendar: "{{ galera_mariadb_backups_increment_on_calendar }}"
-            RandomizedDelaySec: "{{ galera_mariadb_backups_increment_randomized_delay_sec | default(omit) }}"
+            RandomizedDelaySec: "{{ galera_mariadb_backups_increment_randomized_delay_sec }}"
             Persistent: true
             Unit: "mariabackup-increment.service"
   when: galera_mariadb_backups_increment_on_calendar is defined