Merge branch 'master' of https://lab.nexedi.com/nexedi/slapos

component/garbage-collector/buildout.cfg

@@ -6,8 +6,8 @@ parts = garbage-collector
 
 [garbage-collector]
 recipe = slapos.recipe.cmmi
-md5sum = 5e230029f802d0ac633b1d9b3d4934c9
-url = http://www.hboehm.info/gc/gc_source/gc-7.2e.tar.gz
+md5sum = 6f77f9fff5fb5bf96adfc1e93cd035b6
+url = http://www.hboehm.info/gc/gc_source/gc-7.2g.tar.gz
 configure-options =
   --enable-cplusplus
   --disable-gcj-support

component/libtiff/buildout.cfg

@@ -2,7 +2,6 @@
 extends =
   ../libjpeg/buildout.cfg
   ../jbigkit/buildout.cfg
-  ../patch/buildout.cfg
   ../zlib/buildout.cfg
 
 parts =
@@ -10,12 +9,8 @@ parts =
 
 [libtiff]
 recipe = slapos.recipe.cmmi
-version = 4.0.3
-url = http://www.imagemagick.org/download/delegates/tiff-${:version}.tar.gz
-md5sum = 051c1068e6a0627f461948c365290410
-patch-options = -p1
-patches =
-  ${:_profile_base_location_}/tiff_4.0.3-12.3.debian.patch#c246dc095f57f869b35cf40a32aa8366
+url = http://download.osgeo.org/libtiff/tiff-4.0.7.tar.gz
+md5sum = 77ae928d2c6b7fb46a21c3a29325157b
 configure-options =
   --disable-static
   --without-x

software/neoppod/my.cnf.in

@@ -33,7 +33,7 @@ innodb_locks_unsafe_for_binlog = 1
 {{x}}sync_frm = 0
 
 # Extra parameters.
-{%- do extra_dict.setdefault('innodb_file_per_table',  '0') %}
+{%- do extra_dict.setdefault('innodb_file_per_table',  '1') %}
 {%- for k, v in extra_dict.iteritems() %}
 {%- do assert('-' not in k) %}
 {{ k }} = {{ v }}

software/neoppod/software-common.cfg

@@ -101,7 +101,7 @@ md5sum = cd2a978a09c5686205592923866f6584
 [template-neo-my-cnf]
 <= download-base-neo
 url = ${:_profile_base_location_}/my.cnf.in
-md5sum = 81ab5e842ecf8385b12d735585497cc8
+md5sum = cfdd59d42ae540563a964ccaf8fec232
 
 [versions]
 slapos.recipe.template = 2.9

software/slaprunner/common.cfg

@@ -84,7 +84,7 @@ recipe = hexagonit.recipe.download
 ignore-existing = true
 url = ${:_profile_base_location_}/template/runner-export.sh.jinja2
 download-only = true
-md5sum = c835dff22a1e3de3dacb325acb691299
+md5sum = e2d472ade09c11c70dbea080932e80bd
 filename = runner-export.sh.jinja2
 mode = 0644
 

software/slaprunner/template/runner-export.sh.jinja2

@@ -61,3 +61,36 @@ if [ -d {{ directory['backup'] }}/runner/software ]; then
 fi
 
 cd {{ directory['backup'] }} && find -type f ! -name backup.signature -print0 | xargs -P4 -0 sha256sum | LC_ALL=C sort -k 66 > backup.signature
+
+# Check that export didn't happen during backup of instances
+tmp_backup_sum=$(mktemp -p {{ directory['tmp'] }})
+tmp_filtered_signature=$(mktemp -p {{ directory['tmp'] }})
+
+remove_tmp_files () {
+  rm $tmp_backup_sum
+  rm $tmp_filtered_signature
+}
+trap remove_tmp_files EXIT
+
+cd $srv_directory
+
+backup_directory_path=$(find . -path "./runner/instance/slappart*/srv/backup/*" -type f)
+
+# If no backup found, it's over
+if [ -z "$backup_directory_path" ]; then
+  exit 0
+fi
+
+sleep 5
+sha256sum $backup_directory_path | LC_ALL=C sort -k 66 > $tmp_backup_sum
+cat {{ directory['backup'] }}/backup.signature | egrep "instance/slappart.*/srv/backup/" > $tmp_filtered_signature
+
+# If the diff fails, then the notifier will restart this script
+diff_status=0
+diff $tmp_backup_sum $tmp_filtered_signature || diff_status=1
+if [ $diff_status -ne 0 ]; then
+  echo "ERROR: Some backups are not consistents, exporter should be re-run."
+  echo "Let's sleep 10 minutes, to let the backup end..."
+  sleep 10m
+  exit 1
+fi

stack/monitor/buildout.cfg

@@ -96,7 +96,7 @@ recipe = slapos.recipe.template:jinja2
 filename = template-monitor.cfg
 template = ${:_profile_base_location_}/instance-monitor.cfg.jinja2.in
 rendered = ${buildout:directory}/template-monitor.cfg
-md5sum = 870ff63cde9cc0f50fd7ad4b727bdf8c
+md5sum = 5b6b7a96bfa1e0ca83310caa48ed7b20
 context =
     key apache_location apache:location
     key gzip_location gzip:location

stack/monitor/instance-monitor.cfg.jinja2.in

@@ -374,10 +374,12 @@ recipe = collective.recipe.template
 file = ${monitor-conf-parameters:promise-output-file}
 input = inline:#!{{ dash_executable_location }}
   pidfile=${monitor-conf-parameters:pid-file}
-  COMMAND=monitor.bootstrap
   if [ -s $pidfile ]; then
-    for i in {1..20}; do
-      if pid=`pgrep -F $pidfile -f "$COMMAND" 2>/dev/null`; then
+    COUNTER=0
+    # Wait until max 20 seconds, the limit promise timeout
+    while [ $COUNTER -lt 20 ]; do
+      if [ -n "$(ps -p $(cat $pidfile) -o pid=)" ]; then
+        ((COUNTER=COUNTER+1))
         sleep 0.5
       else
         break