Merge branch '18-job-failed-170469' into 'master'

Resolve "Job Failed #170469"

Closes #18

See merge request allzp/turbo!2

cicd_testing/do-test.sh

@@ -45,6 +45,9 @@ function setup_server()
 	$TURBO_HOME/bin/prepd.exe &
 	prepd_pid=$!
 
+	# wait for turbod and prepd to be up.
+	timeout 300 bash -c "(while ! $TURBO_HOME/bin/turbo-cli.exe ping; do sleep 1; done   )"
+
 
 }
 

cicd_testing/turbo_docker/start_turbo.sh

@@ -2,16 +2,23 @@
 
 main()
 {
+	# start postgres
 	service postgresql start
+
+	# wait for postres to start
+	while ! pg_isready; do sleep 1; done;
+
+
+	# setup connections and env for turbod and prepd
 	export USER=root;
 	cd /turbo
 	source ./set_env_vars 
 
-	sleep 10 # let postgres start
-
+	# start trubo
 	cd /tmp
 	/turbo/bin/turbod.exe  > /tmp/turbod.log 2>&1 &
-	sleep 10 # let turbod start 
+
+	# start prepd
 	/turbo/bin/prepd.exe > /tmp/prepd.log 2>&1 
 
 }

prepd/prepd.cpp

@@ -63,7 +63,7 @@ void do_zafl(pqxx::connection &conn, int32_t log_id, const WorkUnit_t& work)
 	if(file_write != raw.size())
 	{
 		prepare();
-		txn->prepared("update_log")("Could create tmp output file.  Out of disk space?\n")(work.getVersionID()).exec();
+		txn->prepared("update_log")("Couldn't create tmp output file.  Out of disk space?\n")(work.getVersionID()).exec();
 		txn->prepared("mark_err")(work.getVersionID()).exec();
 		txn->commit();
 		txn = make_unique<pqxx::work>(conn);

set_env_vars

@@ -12,6 +12,7 @@ if [ -z "$TURBO_INSTALL" ]; then
 	fi
 fi
 
+export PS_INSTALL=$TURBO_INSTALL/zipr
 export ZAFL_INSTALL=$TURBO_INSTALL/zafl
 
 cd $TURBO_HOME/zipr; source ./set_env_vars

zafl @ fd1260ad

-Subproject commit a5b44bc9975b914ae7dd5d36e5b9f3f9dff2a2a4
+Subproject commit fd1260adbf3eed374d6a5b74995a1323574136c5