fix(libvirt): match hook with changes made to manage vnc pipes

libvirt/hooks/qemu.d/ws

@@ -4,27 +4,29 @@
 #       operations, i.e., started, stopped.
 #
 
-# TODO: re-enable after the possible libvirt deadlock is fixed.
+function log {
-exit 0
+	echo "$(date -Is):libvirt_hooks:ws; $@" >>/var/log/anvil.log;
-
+}
-{
+
-	echo "wsargs=$@"
+log "wsargs=$@"
-
+
-	domain_xml=$(</dev/stdin)
+domain_xml=$(</dev/stdin)
-	guest_name="$1"
+guest_name="$1"
-	operation="$2"
+operation="$2"
-
+
-	# Operation migrate will:
+# Operation migrate will:
-	# 1. Trigger migrate->prepare->start->started operation on the destination host.
+# 1. Trigger migrate->prepare->start->started operation on the destination host.
-	# 2. Trigger stopped->release operations on the source host.
+# 2. Trigger stopped->release operations on the source host.
-	if [[ "$operation" == "started" || "$operation" == "stopped" ]]
+if [[ ! $operation =~ ^(started|stopped)$ ]]
-	then
+then
-		ws_open_flag=""
+	exit
-		ws_port_flag=""
+fi
-		ws_suuid_flag=""
+
-
+ws_open_flag=""
-		if [[ "$operation" == "started" ]]
+ws_port_flag=""
-		then
+
+if [[ $operation == "started" ]]
+then
 	ws_open_flag="--open"
 
 	# Cannot call $ virsh vncdisplay... because libvirt hooks
@@ -32,24 +34,10 @@ exit 0
 	# a deadlock will happen.
 	server_vnc_port=$( grep "<graphics.*type=['\"]vnc['\"]" <<<$domain_xml | grep -oPm1 "(?<=port=['\"])\d+" )
 	ws_port_flag="--server-vnc-port ${server_vnc_port}"
+fi
 
-			server_uuid=$( grep -oPm1 "(?<=<uuid>)[^\s]+(?=<)" <<<$domain_xml )
+ws_command_args="--server \"$guest_name\" $ws_port_flag $ws_open_flag"
-			ws_suuid_flag="--server-uuid ${server_uuid}"
-
-			local_host_uuid=$(</etc/anvil/host.uuid)
-
-			update_sql="UPDATE servers SET server_host_uuid = '$local_host_uuid' WHERE server_name = '$guest_name';"
-			echo "wsupdate=$update_sql"
-			anvil-access-module --query "$update_sql" --mode write
-		fi
 
-		ws_command_args="--server \"$guest_name\" $ws_suuid_flag --server-host-uuid local $ws_port_flag --component ws $ws_open_flag"
+log "wscmd=$ws_command_args"
-		echo "wscmd=$ws_command_args"
-		striker-manage-vnc-pipes --server "$guest_name" $ws_suuid_flag --server-host-uuid local $ws_port_flag --component ws $ws_open_flag
-		echo "wscmd_exit=$?"
 
-		# Don't interrupt libvirt regardless of whether websockify gets setup
+striker-manage-vnc-pipes $ws_command_args &
-		# successfully.
-		exit 0
-	fi
-} >>/var/log/anvil.log