Merge pull request #199 from nak3/password-change

bz1505037: Introduce DEBUG_IGNORE_SCRIPT_FAILURES option to rescue from failure of the setup script
sclorg · Jan 2, 2018 · a0e6a39 · a0e6a39
2 parents 5e58000 + 061fd47
commit a0e6a39
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 1 deletion.
diff --git a/5.5/root/usr/share/container-scripts/mysql/passwd-change.sh b/5.5/root/usr/share/container-scripts/mysql/passwd-change.sh
@@ -22,4 +22,3 @@ else
     FLUSH PRIVILEGES;
 EOSQL
 fi
-
diff --git a/root-common/usr/bin/run-mysqld b/root-common/usr/bin/run-mysqld
@@ -3,6 +3,9 @@
 export_vars=$(cgroup-limits); export $export_vars
 source ${CONTAINER_SCRIPTS_PATH}/common.sh
 set -eu
+if [[ -v DEBUG_IGNORE_SCRIPT_FAILURES ]]; then
+  set +e
+fi
 
 export_setting_variables
 

diff --git a/root-common/usr/bin/run-mysqld-master b/root-common/usr/bin/run-mysqld-master
@@ -6,6 +6,9 @@
 export_vars=$(cgroup-limits); export $export_vars
 source ${CONTAINER_SCRIPTS_PATH}/common.sh
 set -eu
+if [[ -v DEBUG_IGNORE_SCRIPT_FAILURES ]]; then
+  set +e
+fi
 
 export_setting_variables
 

diff --git a/root-common/usr/bin/run-mysqld-slave b/root-common/usr/bin/run-mysqld-slave
@@ -6,6 +6,9 @@
 export_vars=$(cgroup-limits); export $export_vars
 source ${CONTAINER_SCRIPTS_PATH}/common.sh
 set -eu
+if [[ -v DEBUG_IGNORE_SCRIPT_FAILURES ]]; then
+  set +e
+fi
 
 export_setting_variables
 

diff --git a/root-common/usr/share/container-scripts/mysql/helpers.sh b/root-common/usr/share/container-scripts/mysql/helpers.sh
@@ -21,4 +21,7 @@ function log_volume_info {
     shift
   done
   set -e
+  if [[ -v DEBUG_IGNORE_SCRIPT_FAILURES ]]; then
+    set +e
+  fi
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,4 +21,7 @@ function log_volume_info { @@
         shift
       done
       set -e
+      if [[ -v DEBUG_IGNORE_SCRIPT_FAILURES ]]; then
+        set +e
+      fi
     }