Add start-task and finish-task events

This commit extendes the monitoring mechanism to include events from
snf-image-helper.

snf-image-helper/common.sh

@@ -17,6 +17,8 @@
 # 02110-1301, USA.
 
 RESULT=/dev/ttyS1
+MONITOR=/dev/ttyS2
+
 FLOPPY_DEV=/dev/fd0
 PROGNAME=$(basename $0)
 
@@ -35,6 +37,8 @@ REGLOOKUP=reglookup
 CHNTPW=chntpw
 
 CLEANUP=( )
+ERRORS=( )
+WARNINGS=( )
 
 add_cleanup() {
     local cmd=""
@@ -43,14 +47,83 @@ add_cleanup() {
 }
 
 log_error() {
+    ERRORS+=("$@")
     echo "ERROR: $@" | tee $RESULT >&2
     exit 1
 }
 
 warn() {
+    WARNINGS+=("$@")
     echo "Warning: $@" >&2
 }
 
+report_start_task() {
+
+    local id="$SNF_IMAGE_HOSTNAME"
+    local type="ganeti-start-task"
+    local timestamp=$(date +%s)
+    local name="${PROGNAME}"
+
+    report="{\"id\":\"$id\","
+    report+="\"type\":\"$type\"," \
+    report+="\"timestamp\":$(date +%s)," \
+    report+="\"name\":\"$name\"}"
+
+    echo "$report" > "$MONITOR"
+}
+
+json_list() {
+    declare -a items=("${!1}")
+    report="["
+    for item in "${items[@]}"; do
+        report+="\"$(sed 's/"/\\"/g' <<< "$item")\","
+    done
+    if [ ${#report} -gt 1 ]; then
+        # remove last comma(,)
+        report="${report%?}"
+    fi
+    report+="]"
+
+    echo "$report"
+}
+
+report_end_task() {
+
+    local id="$SNF_IMAGE_HOSTNAME"
+    local type="ganeti-end-task"
+    local timestam=$(date +%s)
+    local name=${PROGNAME}
+    local warnings=$(json_list WARNINGS[@])
+
+    report="{\"id\":\"$id\","
+    report+="\"type\":\"$type\"," \
+    report+="\"timestamp\":$(date +%s)," \
+    report+="\"name\":\"$name\"," \
+    report+="\"warnings\":\"$warnings\"}"
+
+    echo "$report" > "$MONITOR"
+}
+
+report_error() {
+    local id="$SNF_IMAGE_HOSTNAME"
+    local type="ganeti-error"
+    local timestamp=$(date +%s)
+    local location="${PROGNAME}"
+    local errors=$(json_list ERRORS[@])
+    local warnings=$(json_list WARNINGS[@])
+    local stderr="$(cat "$STDERR_FILE" | sed 's/"/\\"/g')"
+
+    report="{\"id\":\"$id\","
+    report+="\"type\":\"$type\"," \
+    report+="\"timestamp\":$(date +%s)," \
+    report+="\"location\":\"$location\"," \
+    report+="\"errors\":$errors," \
+    report+="\"warnings\":$warnings," \
+    report+="\"stderr\":\"$stderr\"}"
+
+    echo "$report" > "$MONITOR"
+}
+
 get_base_distro() {
     local root_dir=$1
 
@@ -329,6 +402,18 @@ cleanup() {
   fi
 }
 
+task_cleanup() {
+    rc=$?
+
+    if [ $rc -eq 0 ]; then
+       report_end_task 
+    else
+       report_error
+    fi
+
+    cleanup
+}
+
 check_if_excluded() {
 
     local exclude=SNF_IMAGE_PROPERTY_EXCLUDE_TASK_${PROGNAME:2}
@@ -343,4 +428,8 @@ check_if_excluded() {
 trap cleanup EXIT
 set -o pipefail
 
+STDERR_FILE=$(mktemp)
+add_cleanup rm -f "$STDERR_FILE"
+exec 2> >(tee -a "$STDERR_FILE" >&2)
+
 # vim: set sta sts=4 shiftwidth=4 sw=4 et ai :

snf-image-helper/tasks/10FixPartitionTable.in

@@ -26,6 +26,8 @@
 set -e
 . "@commondir@/common.sh"
 
+trap task_cleanup EXIT
+report_start_task
 # Check if the task should be prevented from running.
 check_if_excluded
 

snf-image-helper/tasks/20FilesystemResizeUnmounted.in

@@ -27,6 +27,8 @@
 set -e
 . "@commondir@/common.sh"
 
+trap task_cleanup EXIT
+report_start_task
 # Check if the task should be prevented from running.
 check_if_excluded
 

snf-image-helper/tasks/30MountImage.in

@@ -26,6 +26,9 @@
 set -e
 . "@commondir@/common.sh"
 
+trap task_cleanup EXIT
+report_start_task
+
 if [ ! -d "$SNF_IMAGE_TARGET" ]; then
     log_error "Target dir:\`$SNF_IMAGE_TARGET' is missing"
 fi

snf-image-helper/tasks/40AddSwap.in

@@ -27,6 +27,9 @@
 set -e
 . "@commondir@/common.sh"
 
+trap task_cleanup EXIT
+report_start_task
+
 # Check if the task should be prevented from running.
 check_if_excluded
 

snf-image-helper/tasks/40DeleteSSHKeys.in

@@ -27,6 +27,9 @@
 set -e
 . "@commondir@/common.sh"
 
+trap task_cleanup EXIT
+report_start_task
+
 # Check if the task should be prevented from running.
 check_if_excluded
 

snf-image-helper/tasks/40DisableRemoteDesktopConnections.in

@@ -34,6 +34,9 @@
 set -e
 . "@commondir@/common.sh"
 
+trap task_cleanup EXIT
+report_start_task
+
 # Check if the task should be prevented from running.
 check_if_excluded
 

snf-image-helper/tasks/40InstallUnattend.in

@@ -27,6 +27,9 @@
 set -e
 . "@commondir@/common.sh"
 
+trap task_cleanup EXIT
+report_start_task
+
 if [ -z "$SNF_IMAGE_TARGET" ]; then
     log_error "Target dir: \`$SNF_IMAGE_TARGET' is missing"
 fi

snf-image-helper/tasks/40SELinuxAutorelabel.in

@@ -27,6 +27,9 @@
 set -e
 . "@commondir@/common.sh"
 
+trap task_cleanup EXIT
+report_start_task
+
 # Check if the task should be prevented from running.
 check_if_excluded
 

snf-image-helper/tasks/50AssignHostname.in

@@ -27,6 +27,9 @@
 set -e
 . "@commondir@/common.sh"
 
+trap task_cleanup EXIT
+report_start_task
+
 # Check if the task should be prevented from running.
 check_if_excluded
 

snf-image-helper/tasks/50ChangePassword.in

@@ -27,6 +27,9 @@
 set -e
 . "@commondir@/common.sh"
 
+trap task_cleanup EXIT
+report_start_task
+
 # Check if the task should be prevented from running.
 check_if_excluded
 

snf-image-helper/tasks/50EnforcePersonality.in

@@ -28,6 +28,9 @@ set -e
 
 . "@commondir@/common.sh"
 
+trap task_cleanup EXIT
+report_start_task
+
 # Check if the task should be prevented from running.
 check_if_excluded
 

snf-image-helper/tasks/50FilesystemResizeMounted.in

@@ -27,6 +27,9 @@
 set -e
 . "@commondir@/common.sh"
 
+trap task_cleanup EXIT
+report_start_task
+
 # Check if the task should be prevented from running.
 check_if_excluded
 

snf-image-helper/tasks/80UmountImage.in

@@ -27,6 +27,9 @@
 set -e
 . "@commondir@/common.sh"
 
+trap task_cleanup EXIT
+report_start_task
+
 if [ ! -d "$SNF_IMAGE_TARGET" ]; then
 	log_error "Target dir:\`$SNF_IMAGE_TARGET' is missing"
 fi

snf-image-host/create

@@ -149,7 +149,8 @@ echo "$(date +%Y:%m:%d-%H:%M:%S.%N) Starting helper VM..."
 $TIMELIMIT -t "$HELPER_SOFT_TIMEOUT" -T "$HELPER_HARD_TIMEOUT" \
     kvm -runas "$HELPER_USER" -drive file="$snapshot" \
     -drive file="$blockdev",format=raw,if=virtio,cache=none \
-    -boot c -serial stdio -serial file:"$result_file" \
+    -boot c -serial stdio -serial "file:$(printf "%q" "$result_file")" \
+    -serial "file:$(printf "%q" "$monitor_pipe")" \
     -fda "$floppy" -vga none -nographic -parallel none -monitor null \
     -kernel "$HELPER_KERNEL" -initrd "$HELPER_INITRD" \
     -append "quiet ro root=/dev/sda1 console=ttyS0,9600n8 snf_image_activate_helper" \