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

Jump to bottom

Various fixes to get external validators able to attach to a testnet using the release tarball #3428

Merged
merged 4 commits into from
Mar 22, 2019
Merged

Various fixes to get external validators able to attach to a testnet using the release tarball #3428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
07c3521
Kill all node processes (blockexplorer)
mvines Mar 22, 2019
7545034
Run a drone on blockstreamer nodes
mvines Mar 22, 2019
7d40e82
Use installed binaries if not within the cargo workspace
mvines Mar 22, 2019
bd9c086
Include multinode-demo scripts in release tarball
mvines Mar 22, 2019
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
1 change: 1 addition & 0 deletions ci/publish-tarball.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ echo --- Creating tarball
cargo install --path . --features=cuda --root ../solana-release-cuda
)
cp solana-release-cuda/bin/solana-fullnode solana-release/bin/solana-fullnode-cuda
cp -a scripts multinode-demo solana-release/

tar jvcf solana-release-$TARGET.tar.bz2 solana-release/
cp solana-release/bin/solana-install solana-install-$TARGET
Expand Down
3 changes: 2 additions & 1 deletion multinode-demo/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ if [[ $(uname) != Linux ]]; then
fi
fi

if [[ -n $USE_INSTALL ]]; then # Assume |./scripts/cargo-install-all.sh| was run

if [[ -n $USE_INSTALL || ! -f "$(dirname "${BASH_SOURCE[0]}")"/../Cargo.toml ]]; then
solana_program() {
declare program="$1"
printf "solana-%s" "$program"
Expand Down
2 changes: 1 addition & 1 deletion net/net.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ stopNode() {
pgid=\$(ps opgid= \$(cat \$pid) | tr -d '[:space:]')
sudo kill -- -\$pgid
done
for pattern in solana- remote-; do
for pattern in node solana- remote-; do
pkill -9 \$pattern
done
"
Expand Down
7 changes: 7 additions & 0 deletions net/remote/remote-node.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,13 @@ local|tar)
fi

if [[ $nodeType = blockstreamer ]]; then
# Sneak the mint-id.json from the bootstrap leader and run another drone
# with it on the blockstreamer node. Typically the blockstreamer node has
# a static IP/DNS name for hosting the blockexplorer web app, and is
# a location that somebody would expect to be able to airdrop from
scp "$entrypointIp":~/solana/config-local/mint-id.json config-local/
./multinode-demo/drone.sh > drone.log 2>&1 &

npm install @solana/blockexplorer@1
npx solana-blockexplorer > blockexplorer.log 2>&1 &

Expand Down