Video stopping resilience from Zalenium side

Author: elgalu

CHANGELOG.md

@@ -7,6 +7,34 @@ Note image ids also change after scm-source.json has being updated which trigger
 ###### To get container versions
     docker exec grid versions
 
+## TBD_DOCKER_TAG
+ + **Changes:** https://github.com/elgalu/docker-selenium/compare/TBD_PREV_COMM...TBD_CUR_COMM (TBD_DATE)
+    + Improve stop-video functionality via VIDEO_TMP_FILE_EXTENSION & others
+    + Avoid wait video shutdown from halting in Zalenium / in general
+    + Improve video stopping workflow by grabbing mkv and converting to mp4 after that
+    + Video stopping resilience from Zalenium side from version >= 3.3.1
+ + **Image tag details:**
+    + Selenium 2: TBD_SELENIUM_2_VERSION (TBD_SELENIUM_2_REVISION)
+    + Selenium 3: 3.2.0 (8c03df6)
+    + Chrome stable:  TBD_CHROME_STABLE
+    + Firefox for Selenium 2: TBD_FIREFOX_FOR_SEL2
+    + Firefox for Selenium 3: TBD_FIREFOX_FOR_SEL3
+    + Geckodriver: TBD_GECKO_DRIVER
+    + Chromedriver: TBD_CHROME_DRIVER (TBD_CHROMEDRIVER_COMMIT)
+    + Java: TBD_JAVA_VENDOR Java TBD_JAVA_BUILD
+    + Timezone: TBD_TIME_ZONE
+    + FROM ubuntu:UBUNTU_FLAVOR-UBUNTU_DATE
+    + Python: TBD_PYTHON_VERSION
+    + Tested on kernel dev host: 4.4.0-70-generic x86_64
+    + Tested on kernel CI  host: TBD_HOST_UNAME
+    + Built at dev host with: Docker version 17.03.1-ce, build c6d412e
+    + Built at CI  host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
+    + Built at dev host with: Docker Compose version 1.11.2, build dfed245
+    + Built at CI  host with: Docker Compose version TBD_DOCKER_COMPOSE_VERS, build TBD_DOCKER_COMPOSE_BUILD
+    + Image size: TBD_IMAGE_SIZE
+    + Digest: TBD_DIGEST
+    + Image ID: TBD_IMAGE_ID
+
 ## 3.2.0-p3
  + **Changes:** https://github.com/elgalu/docker-selenium/compare/TBD_PREV_COMM...TBD_CUR_COMM (2017-03-21)
     + Enable MP4Box as it was incorrectly targeting the files

CONTRIBUTING.md

@@ -12,7 +12,7 @@ For pull requests or local commits:
 
 For repository owners only:
 
-    git commit -m "Enable MP4Box as it was incorrectly targeting the files"
+    git commit -m "Video stopping resilience from Zalenium side"
     git tag -d latest && git tag `cat VERSION` && git push origin tmp-`cat VERSION` && git push --tags
 
 -- Wait for Travis to pass OK

Dockerfile

@@ -864,29 +864,30 @@ ENV FIREFOX_VERSION="${FF_VER}" \
   LOGFILE_MAXBYTES=10MB \
   LOGFILE_BACKUPS=5 \
   LOGS_DIR="/var/log/cont" \
-  FFMPEG_FRAME_RATE=10 \
-  FFMPEG_CODEC_ARGS="-crf 0 -preset ultrafast -qp 0" \
-  FFMPEG_FINAL_CRF=0 \
   VIDEO="false" \
   GRID="true" \
   CHROME="true" \
   FIREFOX="true" \
   RC_CHROME="false" \
   RC_FIREFOX="false" \
+  FFMPEG_FRAME_RATE=10 \
+  FFMPEG_CODEC_ARGS="-crf 0 -preset ultrafast -qp 0" \
+  FFMPEG_FINAL_CRF=0 \
   VIDEO_TMP_FILE_EXTENSION="mkv" \
   VIDEO_FILE_EXTENSION="mp4" \
   MP4_INTERLEAVES_MEDIA_DATA_CHUNKS_SECS="500" \
   VIDEO_FILE_NAME="" \
-  VIDEO_BEFORE_STOP_SLEEP_SECS="0" \
-  VIDEO_AFTER_STOP_SLEEP_SECS="0" \
-  VIDEO_MP4_FIX_MAX_WAIT="3s" \
+  VIDEO_BEFORE_STOP_SLEEP_SECS="1" \
+  VIDEO_AFTER_STOP_SLEEP_SECS="0.5" \
+  VIDEO_STOPWAITSECS="50" \
+  VIDEO_CONVERSION_MAX_WAIT="20s" \
+  VIDEO_MP4_FIX_MAX_WAIT="8s" \
   VIDEO_WAIT_VID_TOOL_PID_1st_sig_UP_TO_SECS="6s" \
   VIDEO_WAIT_VID_TOOL_PID_2nd_sig_UP_TO_SECS="2s" \
   VIDEO_WAIT_VID_TOOL_PID_3rd_sig_UP_TO_SECS="1s" \
-  VIDEO_STOP_1st_sig_TYPE="SIGINT" \
-  VIDEO_STOP_2nd_sig_TYPE="SIGTERM" \
+  VIDEO_STOP_1st_sig_TYPE="SIGTERM" \
+  VIDEO_STOP_2nd_sig_TYPE="SIGINT" \
   VIDEO_STOP_3rd_sig_TYPE="SIGKILL" \
-  VIDEO_STOPWAITSECS=20 \
   WAIT_TIME_OUT_VIDEO_STOP="20s" \
   VIDEOS_DIR="/home/seluser/videos" \
   XMANAGER="fluxbox" \

video-rec/bin/fix_videos.sh

@@ -46,10 +46,21 @@ sudo chown ${HOST_UID}:${HOST_GID} "${tmp_video_path}"* || true
 
 if [ "${VIDEO_TMP_FILE_EXTENSION}" != "${VIDEO_FILE_EXTENSION}" ]; then
   log "Changing video encoding from ${VIDEO_TMP_FILE_EXTENSION} to ${VIDEO_FILE_EXTENSION}..."
-  # ffmpeg -i ${tmp_video_path} -vcodec libx264 -crf ${FFMPEG_FINAL_CRF} ${final_video_path}
-  ffmpeg -i ${tmp_video_path} ${final_video_path}
-  log "Conversion from ${VIDEO_TMP_FILE_EXTENSION} to ${VIDEO_FILE_EXTENSION} completed, cleaning up ${tmp_video_path} ..."
-  rm -f "${tmp_video_path}"
+
+  # TODO: Move this mkv to mp4 conversion to a post-processing Zalenium thread
+  # ffmpeg -i ${tmp_video_path} ${final_video_path}
+  if timeout --foreground "${VIDEO_CONVERSION_MAX_WAIT}" \
+        ffmpeg -i ${tmp_video_path} -vcodec libx264 ${FFMPEG_CODEC_ARGS} ${final_video_path}; \
+        then
+    log "Conversion from ${VIDEO_TMP_FILE_EXTENSION} to ${VIDEO_FILE_EXTENSION} succeeded!"
+    log "Cleaning up ${tmp_video_path} ..."
+    rm -f "${tmp_video_path}"
+  else
+    log "Conversion from ${VIDEO_TMP_FILE_EXTENSION} to ${VIDEO_FILE_EXTENSION} FAILED! in within the ${VIDEO_CONVERSION_MAX_WAIT}"
+    rm -f "${final_video_path}"
+    mv "${tmp_video_path}" "${final_video_path}"
+  fi
+
 fi
 
 if [ "${VIDEO_FILE_EXTENSION}" == "mp4" ]; then

video-rec/bin/start-video-rec.sh

@@ -55,9 +55,9 @@ function shutdown {
   local __2nd_sig="${VIDEO_STOP_2nd_sig_TYPE}"
   local __3rd_sig="${VIDEO_STOP_3rd_sig_TYPE}"
 
-  kill -${__1st_sig} ${VID_TOOL_PID} || log "Failed on kill -${__1st_sig} VID_TOOL_PID=${VID_TOOL_PID}"
-  # killall -${__1st_sig} ffmpeg || log "Failed on killall -${__1st_sig} ffmpeg"
   sleep ${VIDEO_BEFORE_STOP_SLEEP_SECS}
+  kill -${__1st_sig} ${VID_TOOL_PID} || log "Tried to kill -${__1st_sig} VID_TOOL_PID=${VID_TOOL_PID}"
+  # killall -${__1st_sig} ffmpeg || log "Tried to killall -${__1st_sig} ffmpeg"
 
   local __secs=${VIDEO_WAIT_VID_TOOL_PID_1st_sig_UP_TO_SECS}
   log "Waiting up to ${__secs} for VID_TOOL_PID=${VID_TOOL_PID} to end with ${__1st_sig}..."
@@ -68,7 +68,7 @@ function shutdown {
     log "Failed VID_TOOL_PID=${VID_TOOL_PID} took longer than ${__secs} ! will try to kill it again..."
 
     local __secs=${VIDEO_WAIT_VID_TOOL_PID_2nd_sig_UP_TO_SECS}
-    kill -${__2nd_sig} ${VID_TOOL_PID} || log "Failed (2nd) on kill -${__2nd_sig} VID_TOOL_PID=${VID_TOOL_PID}"
+    kill -${__2nd_sig} ${VID_TOOL_PID} || log "Tried tond) on kill -${__2nd_sig} VID_TOOL_PID=${VID_TOOL_PID}"
     log "Waiting (again) up to ${__secs} for VID_TOOL_PID=${VID_TOOL_PID} to end with ${__2nd_sig}..."
     if timeout --foreground "${__secs}" \
           wait_pid ${VID_TOOL_PID}; then
@@ -77,13 +77,13 @@ function shutdown {
       log "Failed (3rd) VID_TOOL_PID=${VID_TOOL_PID} took longer than ${__secs} ! will try to kill it again..."
 
       local __secs=${VIDEO_WAIT_VID_TOOL_PID_3rd_sig_UP_TO_SECS}
-      kill -${__3rd_sig} ${VID_TOOL_PID} || log "Failed (4th) on kill -${__3rd_sig} VID_TOOL_PID=${VID_TOOL_PID}"
+      kill -${__3rd_sig} ${VID_TOOL_PID} || log "Tried toth) on kill -${__3rd_sig} VID_TOOL_PID=${VID_TOOL_PID}"
       if timeout --foreground "${__secs}" \
             wait_pid ${VID_TOOL_PID}; then
         log "wait_pid (4th) successfully managed to ${__3rd_sig}:VID_TOOL_PID=${VID_TOOL_PID} within less than ${__secs}"
       else
         log "Failed (4th) VID_TOOL_PID=${VID_TOOL_PID} took longer than ${__secs} ! will try to kill it again..."
-        kill -9 ${VID_TOOL_PID} || log "Failed (4th) on kill -9 VID_TOOL_PID=${VID_TOOL_PID}"
+        kill -9 ${VID_TOOL_PID} || log "Tried toth) on kill -9 VID_TOOL_PID=${VID_TOOL_PID}"
       fi
     fi
   fi