Webunner: Make import script report in a file if import / afterimport was ok

+ make promise checking this

software/slaprunner/instance-runner-import.cfg.in

@@ -26,6 +26,7 @@ parts +=
   instance-software-type
   bash-profile
   supervisord-wrapper
+  importer-consistency-promise
 # have to repeat the next one, as it's not inherited from pbsready-import
   import-on-notification
 ## Monitoring part
@@ -59,12 +60,30 @@ rendered = $${directory:bin}/$${slap-parameter:namebase}-importer
 # backward compatibility for resilient stack
 wrapper = $${:rendered}
 mode = 700
+restore-exit-code-file=$${directory:srv}/importer-exit-code-file
 context =
   key backend_url slaprunner:access-url
   section directory directory
   raw  shell_binary ${dash:location}/bin/dash
   raw  rsync_binary ${rsync:location}/bin/rsync
   raw  curl_binary ${curl:location}/bin/curl
+  raw  restore_exit_code_file $${:restore-exit-code-file}
+
+[importer-consistency-promise]
+# Test that the importer script and "after-import" subscripts:
+# 1/ Have been run in the last 24 hours
+# 2/ Have succeeded
+recipe = collective.recipe.template
+input = inline: #!/bin/sh
+  EXIT_CODE_FILE=$(find "$${importer:restore-exit-code-file}" -mtime -1)
+  if [ -z "$EXIT_CODE_FILE" ]; then
+     echo "Consistency check is too old."
+     exit 1
+   fi
+  EXIT_CODE=$(cat $EXIT_CODE_FILE)
+  exit $EXIT_CODE
+output = $${directory:promises}/importer-consistency-promise
+mode = 755
 
 [slap-parameter]
 auto-deploy-instance = false

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

@@ -35,22 +35,23 @@ cp -r {{ directory['backup'] }}/etc/.??* {{ directory['etc'] }};
 
 # Invoke arbitrary script to perform specific restoration
 # procedure.
+RESTORE_EXIT_CODE=0
 runner_import_restore=$srv_directory/runner-import-restore
 if [ ! -e "$runner_import_restore" ]; then
   touch $runner_import_restore
   chmod +x $runner_import_restore
 fi
 echo "Running $runner_import_restore script..."
-# XXX create exit code file if this failed (same below), and remove this in tidstorage/mariadb
-$srv_directory/runner-import-restore || true
+$srv_directory/runner-import-restore || RESTORE_EXIT_CODE=$?
 
-HOME={{ directory['home'] }}
+echo "Updating slapproxy database, software release and instances..."
+HOME="{{ directory['home'] }}"
+SLAPOS="{{ directory['bin'] }}/slapos"
 # XXX hardcoded
 SQLITE3="$HOME/software_release/parts/sqlite3/bin/sqlite3"
 DATABASE="$HOME/srv/runner/proxy.db"
-
 # Change slapproxy database to point instances to new software release
-# XXX hackish and hardcoded
+# XXX hardcoded
 PARTITION=$(basename $HOME)
 OLD_SOFTWARE_RELEASE=$($SQLITE3 $DATABASE "select software_release from partition11 where reference='slappart0';")
 SOFTWARE_RELEASE=$(echo $OLD_SOFTWARE_RELEASE | sed -e 's/slappart[0-9][0-9]/'"$PARTITION"'/')
@@ -58,21 +59,27 @@ $SQLITE3 $DATABASE "update partition11 set software_release='$SOFTWARE_RELEASE'
 # Change slapproxy database to have all instances stopped
 $SQLITE3 $DATABASE "update partition11 set slap_state='stopped';"
 # Build newest software
-{{ directory['bin'] }}/slapos node software --cfg ~/etc/slapos.cfg --pidfile ~/var/run/slaponode-instance.pid --all || true
+$SLAPOS node software --cfg ~/etc/slapos.cfg --pidfile ~/var/run/slapos-node-software.pid --all >/dev/null 2>&1 || true
 # Remove defined scripts to force buildout to recreate them to have updated paths
-# XXX hack
 rm $srv_directory/runner/instance/slappart*/srv/runner-import-restore
 # Run slapos node instance
 # XXX hardcoded
-{{ directory['bin'] }}/slapos node instance --cfg ~/etc/slapos.cfg --pidfile ~/var/run/slaponode-instance.pid || true
+$SLAPOS node instance --cfg ~/etc/slapos.cfg --pidfile ~/var/run/slapos-node-instance.pid >/dev/null 2>&1 || true
+
 # Invoke defined scripts for each partition inside of slaprunner
 for partition in $srv_directory/runner/instance/slappart*/
 do
   script=$partition/srv/runner-import-restore
   if [ -e "$script" ]; then
     echo "Running $script script..."
-    $script || true
+    $script || RESTORE_EXIT_CODE=$?
   fi
 done
+
 # Change back slapproxy database to have all instances started
 $SQLITE3 $DATABASE "update partition11 set slap_state='started';"
+
+# Write exit code to an arbitrary file that will be checked by promise/monitor
+RESTORE_EXIT_CODE_FILE="{{ restore_exit_code_file }}"
+echo $RESTORE_EXIT_CODE > $RESTORE_EXIT_CODE_FILE
+exit $RESTORE_EXIT_CODE