Fixes #23622: Some jetty patches don't apply to 10.0.17 #2825
Conversation
| [ -z "$(tail -1 $1 | grep FAILED 2>/dev/null)" ] || return 1 | ||
| - local PID=$(cat "$2" 2>/dev/null) || return 1 | ||
| - kill -0 "$PID" 2>/dev/null || return 1 | ||
| echo -n ". " |
There was a problem hiding this comment.
this one, I really don't know what it became. Things seems to have change a lot in the jetty start script. And our git history is broken because of rudder-server new package. I'm not sure what to do with that.
|
PR updated with a new commit |
|
This PR is not mergeable to upper versions. |
|
OK, squash merging this PR |
amousset
force-pushed
the
bug_23622/some_jetty_patches_don_t_apply_to_10_0_17
branch
from
5aa6425
to
ef41f6f
Compare
|
OK, merging this PR |
1 similar comment
|
OK, merging this PR |
| UMASK="0007" | ||
| echo "Setting umask to ${UMASK}" | ||
|
|
||
| + # Checking if enough RAM is available for Jetty to use | ||
| + # Metaspace is auomanaged in JDK8+. Rudder needs 150Mo of it. | ||
| + checkAvailableRam $((${JAVA_XMX}+150)) | ||
|
|
||
| if (( NO_START )); then | ||
| echo "Not starting ${NAME} - NO_START=1"; |
There was a problem hiding this comment.
there muse have been an fi somewhere
| +elif [ -n "${ns}" ]; then # we have namespaces | ||
| + # the sed is here to prepend a fake user field that is removed by the -o option (it is never used) | ||
| + PS_COMMAND="eval ps --no-header -e -O utsns | grep -E '^[[:space:]]*[[:digit:]]*[[:space:]]+${ns}' | sed 's/^/user /'" | ||
| + PS_COMMAND="eval ps --no-header -e -O utsns | grep -E '^[[:space:]]*[[:digit:]]*[[:space:]]+${ns}' | sed 's/^/user > |
| @@ -13,21 +13,21 @@ | |||
| + TOTAL_MEM_NEEDED=$((((${1})*100)/90)) | |||
| + TOTAL_MEM_AVAILABLE=$(($(free -m|awk '/^Mem:/{print $2}')+$(free -m|awk '/^Swap:/{print $2}'))) | |||
| + if [ ${TOTAL_MEM_AVAILABLE} -le ${TOTAL_MEM_NEEDED} ]; then | |||
| + echo "WARNING: Not enough free memory to start Jetty (about ${TOTAL_MEM_NEEDED}MB are needed). Trying anyway, but the application is likely to fail." | |||
| + echo "WARNING: Not enough free memory to start Jetty (about ${TOTAL_MEM_NEEDED}MB are needed). Trying anyway, but> | |||
https://issues.rudder.io/issues/23622
SO. Almost everything changed in the start script between 10.0.12 and 10.0.17. This is unfortunate and feels risky.
Still, I was able to port almost all patches. There is one that I don't understand:
jetty-init-prevent-false-failed-starts.patchThe other ones are mainly change in place, sometime a lot but it seems ok.