Try diff merging several times at five minute intervals

This way if the underlying diffs are ready yet we will have another
go later, and extra ones are harmless as they do nothing.

diff --git a/cookbooks/planet/templates/default/replication.cron.erb b/cookbooks/planet/templates/default/replication.cron.erb
index 8b81f03e0aa148423232be89e439e5adc6ad6faa..5300781be048de6043e3a223a766ff3b7a52cad7 100644 (file)
--- a/cookbooks/planet/templates/default/replication.cron.erb
+++ b/cookbooks/planet/templates/default/replication.cron.erb
@@ -11,5 +11,5 @@ MAILTO=brett@bretth.com
 LD_PRELOAD=/opt/flush/flush.so
 
 * * * * * planet /usr/local/bin/osmosis -q --replicate-apidb authFile=/etc/replication/auth.conf validateSchemaVersion=false --write-replication workingDirectory=/store/planet/replication/minute
-5 * * * * planet /home/bretth/bin/osmosis -q --merge-replication-files workingDirectory=/var/lib/replication/hour
-10 * * * * planet /home/bretth/bin/osmosis -q --merge-replication-files workingDirectory=/var/lib/replication/day
+2,7,12,17 * * * * planet /home/bretth/bin/osmosis -q --merge-replication-files workingDirectory=/var/lib/replication/hour
+5,10,15,20 * * * * planet /home/bretth/bin/osmosis -q --merge-replication-files workingDirectory=/var/lib/replication/day