Remove obsolete internal multinode-demo/ logging (#4265)
This commit is contained in:
parent
1b68da7572
commit
1393d26f63
|
@ -10,9 +10,6 @@
|
||||||
SOLANA_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. || exit 1; pwd)"
|
SOLANA_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. || exit 1; pwd)"
|
||||||
|
|
||||||
rsync=rsync
|
rsync=rsync
|
||||||
bootstrap_leader_logger="tee bootstrap-leader.log"
|
|
||||||
fullnode_logger="tee fullnode.log"
|
|
||||||
drone_logger="tee drone.log"
|
|
||||||
|
|
||||||
if [[ $(uname) != Linux ]]; then
|
if [[ $(uname) != Linux ]]; then
|
||||||
# Protect against unsupported configurations to prevent non-obvious errors
|
# Protect against unsupported configurations to prevent non-obvious errors
|
||||||
|
|
|
@ -14,12 +14,6 @@ source "$here"/common.sh
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
set -ex
|
set -x
|
||||||
|
# shellcheck disable=SC2086 # Don't want to double quote $solana_drone
|
||||||
trap 'kill "$pid" && wait "$pid"' INT TERM ERR
|
exec $solana_drone --keypair "$SOLANA_CONFIG_DIR"/mint-keypair.json "$@"
|
||||||
$solana_drone \
|
|
||||||
--keypair "$SOLANA_CONFIG_DIR"/mint-keypair.json \
|
|
||||||
"$@" \
|
|
||||||
> >($drone_logger) 2>&1 &
|
|
||||||
pid=$!
|
|
||||||
wait "$pid"
|
|
||||||
|
|
|
@ -362,7 +362,7 @@ while true; do
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "$PS4$program ${args[*]}"
|
echo "$PS4$program ${args[*]}"
|
||||||
$program "${args[@]}" > >($fullnode_logger) 2>&1 &
|
$program "${args[@]}" &
|
||||||
pid=$!
|
pid=$!
|
||||||
oom_score_adj "$pid" 1000
|
oom_score_adj "$pid" 1000
|
||||||
|
|
||||||
|
|
|
@ -87,8 +87,7 @@ local|tar)
|
||||||
--gossip-port "$entrypointIp":8001
|
--gossip-port "$entrypointIp":8001
|
||||||
)
|
)
|
||||||
|
|
||||||
./multinode-demo/bootstrap-leader.sh "${args[@]}" > bootstrap-leader.log 2>&1 &
|
./multinode-demo/fullnode.sh --bootstrap-leader "${args[@]}" > fullnode.log 2>&1 &
|
||||||
ln -sTf bootstrap-leader.log fullnode.log
|
|
||||||
;;
|
;;
|
||||||
fullnode|blockstreamer)
|
fullnode|blockstreamer)
|
||||||
net/scripts/rsync-retry.sh -vPrc "$entrypointIp":~/.cargo/bin/ ~/.cargo/bin/
|
net/scripts/rsync-retry.sh -vPrc "$entrypointIp":~/.cargo/bin/ ~/.cargo/bin/
|
||||||
|
|
Loading…
Reference in New Issue