Revert "resilient: new paramater to define the time to sleep before running...

Revert "resilient: new paramater to define the time to sleep before running the backup in the cron job."

This reverts commit 30d1a937.

software/kvm/common.cfg

@@ -127,7 +127,7 @@ on-update = true
 recipe = hexagonit.recipe.download
 ignore-existing = true
 url = ${:_profile_base_location_}/instance-kvm-resilient-test.cfg.jinja2
-md5sum = c1b6a998b362dfd2202e0c19cb49a80d
+md5sum = 6b40e280201aaf9258c4cb5de7c1f5b4
 mode = 0644
 download-only = true
 on-update = true

software/kvm/instance-kvm-resilient-input-schema.json

@@ -50,12 +50,6 @@
                     "type": "string",
                     "optional": true
                 },
-                "resiliency-backup-sleep-time-buffer": {
-                    "title": "Time to sleep before backup",
-                    "description": "Time to sleep once the cron job is triggered before the backup start for real.",
-                    "type": "string",
-                    "optional": true
-                },
                 "remove-backup-older-than": {
                     "title": "Remove backups older than...",
                     "description": "Remove all the backups in PBS that are older than specified value. It should be rdiff-backup-compatible.",

software/kvm/instance-kvm-resilient-test.cfg.jinja2

@@ -59,7 +59,6 @@ config-{{ key }} = {{ dumps(value) }}
 config-virtual-hard-drive-url = ${slap-parameter:virtual-hard-drive-url}
 config-virtual-hard-drive-md5sum = ${slap-parameter:virtual-hard-drive-md5sum}
 config-resiliency-backup-periodicity = */5 * * * *
-config-resiliency-backup-sleep-time-buffer = 0
 config-resilient-clone-number = 1
 config-ignore-known-hosts-file = false
 return = ipv6

software/slaprunner/common.cfg

@@ -107,7 +107,7 @@ recipe = hexagonit.recipe.download
 ignore-existing = true
 url = ${:_profile_base_location_}/instance-resilient-test.cfg.jinja2
 download-only = true
-md5sum = 5b9d2d4b38e2bf4a6440bdf63b634507
+md5sum = 09a955bde79fb11565d689b0415e135c
 filename = instance-resilient-test.cfg.jinja2
 mode = 0644
 

software/slaprunner/instance-resilient-test.cfg.jinja2

@@ -55,7 +55,6 @@ name = Resilient Instance (Root Instance)
 config-{{ key }} = {{ dumps(value) }}
 {% endfor -%}
 config-resiliency-backup-periodicity = */10 * * * *
-config-resiliency-backup-sleep-time-buffer = 0
 config-resilient-clone-number = 1
 config-ignore-known-hosts-file = false
 # XXX hardcoded

software/slaprunner/instance-runner-resilient-input-schema.json

@@ -51,12 +51,6 @@
                     "type": "string",
                     "optional": true
                 },
-                "resiliency-backup-sleep-time-buffer": {
-                    "title": "Time to sleep before backup",
-                    "description": "Time to sleep once the cron job is triggered before the backup start for real.",
-                    "type": "string",
-                    "optional": true
-                },
                 "remove-backup-older-than": {
                     "title": "Remove backups older than...",
                     "description": "Remove all the backups in PBS that are older than specified value. It should be rdiff-backup-compatible.",

stack/resilient/buildout.cfg

@@ -59,7 +59,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/pbsready-export.cfg.in
 output = ${buildout:directory}/pbsready-export.cfg
-md5sum = affd75f6357e2f91521eb5e89a639842
+md5sum = cb2537598981a1a4af0dea05cc6ac6bd
 mode = 0644
 
 [template-pull-backup]

stack/resilient/parameter-schema.json

@@ -25,11 +25,6 @@
       "description": "Periodicity of backup, in cron format. Default is every hour.",
       "type": "string"
     },
-    "resiliency-backup-sleep-time-buffer": {
-      "title": "Time to sleep before backup",
-      "description": "Time to sleep once the cron job is triggered before the backup start for real.",
-      "type": "string",
-    },
     "remove-backup-older-than": {
       "title": "Remove backups older than...",
       "description": "Remove all the backups in PBS that are older than specified value. It should be rdiff-backup-compatible.",

stack/resilient/pbsready-export.cfg.in

@@ -78,11 +78,10 @@ recipe = slapos.cookbook:cron.d
 name = backup
 frequency = $${slap-parameter:resiliency-backup-periodicity}
 # Sleep from 1 to 6 hours before backing up (disks/network IO optimization)
-sleep-command = ${bash:location}/bin/bash -c "sleep $(($${slap-parameter:resiliency-backup-sleep-time-buffer}))"
+sleep-command = ${bash:location}/bin/bash -c "sleep $((RANDOM%(60*60*6)))"
 command = ($${:sleep-command}; $${notifier-exporter:wrapper} --transaction-id `date +%s`)
 
 [slap-parameter]
 # In cron.d format (i.e things like */15 * * * * are accepted).
 resiliency-backup-periodicity = 0 0 * * *
-resiliency-backup-sleep-time-buffer = RANDOM%(60*60*6)