From 96a3ed66a0cf8d52cd85204b8f71050630a955ec Mon Sep 17 00:00:00 2001 From: Younes Manton Date: Thu, 29 Aug 2024 14:30:30 -0700 Subject: [PATCH] Show console.log if server fails when building SCC Show the console.log if the `server start` commands in populate_scc.sh fail, otherwise any useful error messages are going to probably be lost. --- releases/24.0.0.6/full/helpers/build/populate_scc.sh | 4 ++-- releases/24.0.0.6/kernel-slim/helpers/build/populate_scc.sh | 4 ++-- releases/24.0.0.9/full/helpers/build/populate_scc.sh | 4 ++-- releases/24.0.0.9/kernel-slim/helpers/build/populate_scc.sh | 4 ++-- releases/latest/beta/helpers/build/populate_scc.sh | 4 ++-- releases/latest/full/helpers/build/populate_scc.sh | 4 ++-- releases/latest/kernel-slim/helpers/build/populate_scc.sh | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/releases/24.0.0.6/full/helpers/build/populate_scc.sh b/releases/24.0.0.6/full/helpers/build/populate_scc.sh index 5466dd7f7..e73655e31 100755 --- a/releases/24.0.0.6/full/helpers/build/populate_scc.sh +++ b/releases/24.0.0.6/full/helpers/build/populate_scc.sh @@ -110,7 +110,7 @@ if [ $TRIM_SCC == yes ] then echo "Calculating SCC layer upper bound, starting with initial size $SCC_SIZE." # Populate the newly created class cache layer. - /opt/ol/wlp/bin/server start + /opt/ol/wlp/bin/server start || { rc=$?; cat /logs/console.log; exit $rc; } if [ ${WARM_ENDPOINT} == true ] then @@ -145,7 +145,7 @@ fi # Server start/stop to populate the /output/workarea and make subsequent server starts faster. for ((i=0; i<$ITERATIONS; i++)) do - /opt/ol/wlp/bin/server start + /opt/ol/wlp/bin/server start || { rc=$?; cat /logs/console.log; exit $rc; } if [ ${WARM_ENDPOINT} == true ] then diff --git a/releases/24.0.0.6/kernel-slim/helpers/build/populate_scc.sh b/releases/24.0.0.6/kernel-slim/helpers/build/populate_scc.sh index 5466dd7f7..e73655e31 100755 --- a/releases/24.0.0.6/kernel-slim/helpers/build/populate_scc.sh +++ b/releases/24.0.0.6/kernel-slim/helpers/build/populate_scc.sh @@ -110,7 +110,7 @@ if [ $TRIM_SCC == yes ] then echo "Calculating SCC layer upper bound, starting with initial size $SCC_SIZE." # Populate the newly created class cache layer. - /opt/ol/wlp/bin/server start + /opt/ol/wlp/bin/server start || { rc=$?; cat /logs/console.log; exit $rc; } if [ ${WARM_ENDPOINT} == true ] then @@ -145,7 +145,7 @@ fi # Server start/stop to populate the /output/workarea and make subsequent server starts faster. for ((i=0; i<$ITERATIONS; i++)) do - /opt/ol/wlp/bin/server start + /opt/ol/wlp/bin/server start || { rc=$?; cat /logs/console.log; exit $rc; } if [ ${WARM_ENDPOINT} == true ] then diff --git a/releases/24.0.0.9/full/helpers/build/populate_scc.sh b/releases/24.0.0.9/full/helpers/build/populate_scc.sh index 5466dd7f7..e73655e31 100755 --- a/releases/24.0.0.9/full/helpers/build/populate_scc.sh +++ b/releases/24.0.0.9/full/helpers/build/populate_scc.sh @@ -110,7 +110,7 @@ if [ $TRIM_SCC == yes ] then echo "Calculating SCC layer upper bound, starting with initial size $SCC_SIZE." # Populate the newly created class cache layer. - /opt/ol/wlp/bin/server start + /opt/ol/wlp/bin/server start || { rc=$?; cat /logs/console.log; exit $rc; } if [ ${WARM_ENDPOINT} == true ] then @@ -145,7 +145,7 @@ fi # Server start/stop to populate the /output/workarea and make subsequent server starts faster. for ((i=0; i<$ITERATIONS; i++)) do - /opt/ol/wlp/bin/server start + /opt/ol/wlp/bin/server start || { rc=$?; cat /logs/console.log; exit $rc; } if [ ${WARM_ENDPOINT} == true ] then diff --git a/releases/24.0.0.9/kernel-slim/helpers/build/populate_scc.sh b/releases/24.0.0.9/kernel-slim/helpers/build/populate_scc.sh index 5466dd7f7..e73655e31 100755 --- a/releases/24.0.0.9/kernel-slim/helpers/build/populate_scc.sh +++ b/releases/24.0.0.9/kernel-slim/helpers/build/populate_scc.sh @@ -110,7 +110,7 @@ if [ $TRIM_SCC == yes ] then echo "Calculating SCC layer upper bound, starting with initial size $SCC_SIZE." # Populate the newly created class cache layer. - /opt/ol/wlp/bin/server start + /opt/ol/wlp/bin/server start || { rc=$?; cat /logs/console.log; exit $rc; } if [ ${WARM_ENDPOINT} == true ] then @@ -145,7 +145,7 @@ fi # Server start/stop to populate the /output/workarea and make subsequent server starts faster. for ((i=0; i<$ITERATIONS; i++)) do - /opt/ol/wlp/bin/server start + /opt/ol/wlp/bin/server start || { rc=$?; cat /logs/console.log; exit $rc; } if [ ${WARM_ENDPOINT} == true ] then diff --git a/releases/latest/beta/helpers/build/populate_scc.sh b/releases/latest/beta/helpers/build/populate_scc.sh index 5466dd7f7..e73655e31 100755 --- a/releases/latest/beta/helpers/build/populate_scc.sh +++ b/releases/latest/beta/helpers/build/populate_scc.sh @@ -110,7 +110,7 @@ if [ $TRIM_SCC == yes ] then echo "Calculating SCC layer upper bound, starting with initial size $SCC_SIZE." # Populate the newly created class cache layer. - /opt/ol/wlp/bin/server start + /opt/ol/wlp/bin/server start || { rc=$?; cat /logs/console.log; exit $rc; } if [ ${WARM_ENDPOINT} == true ] then @@ -145,7 +145,7 @@ fi # Server start/stop to populate the /output/workarea and make subsequent server starts faster. for ((i=0; i<$ITERATIONS; i++)) do - /opt/ol/wlp/bin/server start + /opt/ol/wlp/bin/server start || { rc=$?; cat /logs/console.log; exit $rc; } if [ ${WARM_ENDPOINT} == true ] then diff --git a/releases/latest/full/helpers/build/populate_scc.sh b/releases/latest/full/helpers/build/populate_scc.sh index 5466dd7f7..e73655e31 100755 --- a/releases/latest/full/helpers/build/populate_scc.sh +++ b/releases/latest/full/helpers/build/populate_scc.sh @@ -110,7 +110,7 @@ if [ $TRIM_SCC == yes ] then echo "Calculating SCC layer upper bound, starting with initial size $SCC_SIZE." # Populate the newly created class cache layer. - /opt/ol/wlp/bin/server start + /opt/ol/wlp/bin/server start || { rc=$?; cat /logs/console.log; exit $rc; } if [ ${WARM_ENDPOINT} == true ] then @@ -145,7 +145,7 @@ fi # Server start/stop to populate the /output/workarea and make subsequent server starts faster. for ((i=0; i<$ITERATIONS; i++)) do - /opt/ol/wlp/bin/server start + /opt/ol/wlp/bin/server start || { rc=$?; cat /logs/console.log; exit $rc; } if [ ${WARM_ENDPOINT} == true ] then diff --git a/releases/latest/kernel-slim/helpers/build/populate_scc.sh b/releases/latest/kernel-slim/helpers/build/populate_scc.sh index 5466dd7f7..e73655e31 100755 --- a/releases/latest/kernel-slim/helpers/build/populate_scc.sh +++ b/releases/latest/kernel-slim/helpers/build/populate_scc.sh @@ -110,7 +110,7 @@ if [ $TRIM_SCC == yes ] then echo "Calculating SCC layer upper bound, starting with initial size $SCC_SIZE." # Populate the newly created class cache layer. - /opt/ol/wlp/bin/server start + /opt/ol/wlp/bin/server start || { rc=$?; cat /logs/console.log; exit $rc; } if [ ${WARM_ENDPOINT} == true ] then @@ -145,7 +145,7 @@ fi # Server start/stop to populate the /output/workarea and make subsequent server starts faster. for ((i=0; i<$ITERATIONS; i++)) do - /opt/ol/wlp/bin/server start + /opt/ol/wlp/bin/server start || { rc=$?; cat /logs/console.log; exit $rc; } if [ ${WARM_ENDPOINT} == true ] then