Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

otp-23 support fix: don't use undefined for longname remote shell #798

Merged
merged 1 commit into from
May 18, 2020
Merged

otp-23 support fix: don't use undefined for longname remote shell #798

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions priv/templates/extended_bin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,9 @@ relx_get_nodename() {
relx_rem_sh() {
# Remove remote_nodename when OTP-23 is the oldest version supported by rebar3/relx.
# sort the used erts version against 11.0 to see if it is less than 11.0 (OTP-23)
# if it is then we must generate a node name to use for the remote node
if [ "11.0" = "$(printf "%s\n11.0" "${ERTS_VSN}" | sort -V | head -n1)" ] ; then
# if it is then we must generate a node name to use for the remote node.
# But this feature is only for short names. So first check if `NAME_TYPE` is `sname`
if [ "${NAME_TYPE}" = "-sname" ] && [ "11.0" = "$(printf "%s\n11.0" "${ERTS_VSN}" | sort -V | head -n1)" ] ; then
# OTP-16616: erl -remsh now uses the dynamic node names feature by default
remote_nodename="${NAME_TYPE} undefined"
else
Expand All @@ -284,7 +285,7 @@ relx_rem_sh() {
# -dist_listen is new in OTP-23. It keeps the remote node from binding to a listen port
# and implies the option -hidden
# shellcheck disable=SC2086
exec "$BINDIR/erl" "${remote_nodename}" -remsh "$NAME" -boot "$REL_DIR"/start_clean -mode interactive \
exec "$BINDIR/erl" ${remote_nodename} -remsh "$NAME" -boot "$REL_DIR"/start_clean -mode interactive \
-boot_var SYSTEM_LIB_DIR "$SYSTEM_LIB_DIR" \
-setcookie "$COOKIE" -hidden -kernel net_ticktime "$TICKTIME" \
-dist_listen false \
Expand Down Expand Up @@ -357,7 +358,7 @@ relx_nodetool() {
ERL_FLAGS="${ERL_FLAGS} ${MAYBE_DIST_ARGS} ${NAME_TYPE} $nodetool_id -setcookie ${COOKIE}" \
"$ERTS_DIR/bin/escript" \
"$ROOTDIR/bin/nodetool" \
"$START_EPMD" "$NAME_TYPE" "$NAME" "$command" "$@"
$START_EPMD "$NAME_TYPE" "$NAME" "$command" "$@"
fi
}

Expand Down