Skip to content

M
metadeploy
Commit 44cc2763 authored by vicotor's avatar vicotor
Browse files
Options

add new container sentryring for node1-ring

parent fd44e06b
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 2 deletions
host/host.sh
View file @ 44cc2763
...@@ -153,6 +153,14 @@ do ...@@ -153,6 +153,14 @@ do
done done
# sentry config # sentry config
## for ring
sentry_config_dir=$datadir/sentry/ring
mkdir -p $sentry_config_dir
cp sentry/ring/app.json $sentry_config_dir/app.json
jq '. + { "rpc_node": "http://'"$connectedSentryIp"':8545" }' $sentry_config_dir/app.json > $sentry_config_dir/app.json.tmp
mv $sentry_config_dir/app.json.tmp $sentry_config_dir/app.json
## for nodes
for i in $(seq 1 $N) for i in $(seq 1 $N)
do do
echo "generate sentry config at $i" echo "generate sentry config at $i"
...@@ -331,6 +339,23 @@ do ...@@ -331,6 +339,23 @@ do
echo ' - meta' >> $composefile echo ' - meta' >> $composefile
echo "" >> $composefile echo "" >> $composefile
echo "" >> $composefile echo "" >> $composefile
if [ $i -eq 1 ]; then
echo " sentryring:" >> $composefile
echo ' image: caduceus/cmp2-test-net-meta-sentry:v0.2.1 ' >> $composefile
echo " container_name: sentryring" >> $composefile
echo ' deploy:' >> $composefile
echo ' restart_policy:' >> $composefile
echo ' condition: on-failure' >> $composefile
echo ' delay: 15s' >> $composefile
echo ' max_attempts: 100' >> $composefile
echo ' window: 120s' >> $composefile
echo ' volumes:' >> $composefile
echo ' - '$datadir'/sentry/ring/app.json:/root/app.json' >> $composefile
echo ' networks:' >> $composefile
echo ' - meta' >> $composefile
echo "" >> $composefile
echo "" >> $composefile
fi
echo " sentry:" >> $composefile echo " sentry:" >> $composefile
echo ' image: caduceus/cmp2-test-net-meta-sentry:v0.2.1 ' >> $composefile echo ' image: caduceus/cmp2-test-net-meta-sentry:v0.2.1 ' >> $composefile
echo " container_name: sentry" >> $composefile echo " container_name: sentry" >> $composefile
...@@ -393,14 +418,23 @@ do ...@@ -393,14 +418,23 @@ do
echo " ring:" >> $composefile echo " ring:" >> $composefile
echo " image: caduceus/cmp2-test-net-meta-ring:v0.2.1" >> $composefile echo " image: caduceus/cmp2-test-net-meta-ring:v0.2.1" >> $composefile
echo " container_name: ring" >> $composefile echo " container_name: ring" >> $composefile
if [ $i -eq 1 ]; then
#echo " entrypoint: sh -c 'echo "+"ring"+" && sleep 10 && ringd start --ethconfig.httphost 0.0.0.0 --mempool.sentryurl sentry:38003 --mempool.nebulaurl nebula:38004 --mempool.p2purl net:38010 --mempool.cryptourl cryptor:38001 --mempool.checkerurl txchecker:38002 --mempool.writeunreadytxs=false --mempool.writerepeatedmsg=false --mempool.batchconfirminittimeout=60 --mempool.batchconfirmtimeouti=1.5 --mempool.batchrepeatedqueuesize=0' " >> $composefile #echo " entrypoint: sh -c 'echo "+"ring"+" && sleep 10 && ringd start --ethconfig.httphost 0.0.0.0 --mempool.sentryurl sentry:38003 --mempool.nebulaurl nebula:38004 --mempool.p2purl net:38010 --mempool.cryptourl cryptor:38001 --mempool.checkerurl txchecker:38002 --mempool.writeunreadytxs=false --mempool.writerepeatedmsg=false --mempool.batchconfirminittimeout=60 --mempool.batchconfirmtimeouti=1.5 --mempool.batchrepeatedqueuesize=0' " >> $composefile
echo " entrypoint: sh -c 'echo "+"ring"+" && sleep 16 && ringd start --ethconfig.httphost 0.0.0.0 --mempool.sentryurl sentryring:38003 --mempool.nebulaurl nebula:38004 --mempool.p2purl net:38010 --mempool.cryptourl cryptor:38001 --mempool.checkerurl txchecker:38002 --mempool.writeunreadytxs=false --mempool.writerepeatedmsg=false --mempool.batchconfirminittimeout=600 --mempool.batchconfirmtimeouti=1.5 --mempool.batchrepeatedqueuesize=0 --mempool.batchconfirmenable=false --rpconfig.async=true >>/data/log 2>&1 ' " >> $composefile
else
echo " entrypoint: sh -c 'echo "+"ring"+" && sleep 16 && ringd start --ethconfig.httphost 0.0.0.0 --mempool.sentryurl sentry:38003 --mempool.nebulaurl nebula:38004 --mempool.p2purl net:38010 --mempool.cryptourl cryptor:38001 --mempool.checkerurl txchecker:38002 --mempool.writeunreadytxs=false --mempool.writerepeatedmsg=false --mempool.batchconfirminittimeout=600 --mempool.batchconfirmtimeouti=1.5 --mempool.batchrepeatedqueuesize=0 --mempool.batchconfirmenable=false --rpconfig.async=true >>/data/log 2>&1 ' " >> $composefile echo " entrypoint: sh -c 'echo "+"ring"+" && sleep 16 && ringd start --ethconfig.httphost 0.0.0.0 --mempool.sentryurl sentry:38003 --mempool.nebulaurl nebula:38004 --mempool.p2purl net:38010 --mempool.cryptourl cryptor:38001 --mempool.checkerurl txchecker:38002 --mempool.writeunreadytxs=false --mempool.writerepeatedmsg=false --mempool.batchconfirminittimeout=600 --mempool.batchconfirmtimeouti=1.5 --mempool.batchrepeatedqueuesize=0 --mempool.batchconfirmenable=false --rpconfig.async=true >>/data/log 2>&1 ' " >> $composefile
fi
echo " volumes:" >> $composefile echo " volumes:" >> $composefile
echo " - "$datadir"/ring/:/data" >> $composefile echo " - "$datadir"/ring/:/data" >> $composefile
echo " depends_on:" >> $composefile echo " depends_on:" >> $composefile
echo " - cryptor" >> $composefile echo " - cryptor" >> $composefile
echo " - net" >> $composefile echo " - net" >> $composefile
echo " - sentry" >> $composefile if [ $i -eq 1 ]; then
echo " - sentryring" >> $composefile
else
echo " - sentry" >> $composefile
fi
# echo "$resourcering" >> $composefile # echo "$resourcering" >> $composefile
echo " ports:" >> $composefile echo " ports:" >> $composefile
echo " - $((28545)):8545" >> $composefile echo " - $((28545)):8545" >> $composefile
......
host/hostbench.sh
View file @ 44cc2763
...@@ -153,6 +153,14 @@ do ...@@ -153,6 +153,14 @@ do
done done
# sentry config # sentry config
## for ring
sentry_config_dir=$datadir/sentry/ring
mkdir -p $sentry_config_dir
cp sentry/ring/app.json $sentry_config_dir/app.json
jq '. + { "rpc_node": "http://'"$connectedSentryIp"':8545" }' $sentry_config_dir/app.json > $sentry_config_dir/app.json.tmp
mv $sentry_config_dir/app.json.tmp $sentry_config_dir/app.json
## for nodes
for i in $(seq 1 $N) for i in $(seq 1 $N)
do do
echo "generate sentry config at $i" echo "generate sentry config at $i"
...@@ -331,6 +339,23 @@ do ...@@ -331,6 +339,23 @@ do
echo ' - meta' >> $composefile echo ' - meta' >> $composefile
echo "" >> $composefile echo "" >> $composefile
echo "" >> $composefile echo "" >> $composefile
if [ $i -eq 1 ]; then
echo " sentryring:" >> $composefile
echo ' image: caduceus/cmp2-test-net-meta-sentry:v0.2.1-bench ' >> $composefile
echo " container_name: sentryring" >> $composefile
echo ' deploy:' >> $composefile
echo ' restart_policy:' >> $composefile
echo ' condition: on-failure' >> $composefile
echo ' delay: 15s' >> $composefile
echo ' max_attempts: 100' >> $composefile
echo ' window: 120s' >> $composefile
echo ' volumes:' >> $composefile
echo ' - '$datadir'/sentry/ring/app.json:/root/app.json' >> $composefile
echo ' networks:' >> $composefile
echo ' - meta' >> $composefile
echo "" >> $composefile
echo "" >> $composefile
fi
echo " sentry:" >> $composefile echo " sentry:" >> $composefile
echo ' image: caduceus/cmp2-test-net-meta-sentry:v0.2.1-bench ' >> $composefile echo ' image: caduceus/cmp2-test-net-meta-sentry:v0.2.1-bench ' >> $composefile
echo " container_name: sentry" >> $composefile echo " container_name: sentry" >> $composefile
...@@ -393,14 +418,23 @@ do ...@@ -393,14 +418,23 @@ do
echo " ring:" >> $composefile echo " ring:" >> $composefile
echo " image: caduceus/cmp2-test-net-meta-ring:v0.2.1" >> $composefile echo " image: caduceus/cmp2-test-net-meta-ring:v0.2.1" >> $composefile
echo " container_name: ring" >> $composefile echo " container_name: ring" >> $composefile
if [ $i -eq 1 ]; then
#echo " entrypoint: sh -c 'echo "+"ring"+" && sleep 10 && ringd start --ethconfig.httphost 0.0.0.0 --mempool.sentryurl sentry:38003 --mempool.nebulaurl nebula:38004 --mempool.p2purl net:38010 --mempool.cryptourl cryptor:38001 --mempool.checkerurl txchecker:38002 --mempool.writeunreadytxs=false --mempool.writerepeatedmsg=false --mempool.batchconfirminittimeout=60 --mempool.batchconfirmtimeouti=1.5 --mempool.batchrepeatedqueuesize=0' " >> $composefile #echo " entrypoint: sh -c 'echo "+"ring"+" && sleep 10 && ringd start --ethconfig.httphost 0.0.0.0 --mempool.sentryurl sentry:38003 --mempool.nebulaurl nebula:38004 --mempool.p2purl net:38010 --mempool.cryptourl cryptor:38001 --mempool.checkerurl txchecker:38002 --mempool.writeunreadytxs=false --mempool.writerepeatedmsg=false --mempool.batchconfirminittimeout=60 --mempool.batchconfirmtimeouti=1.5 --mempool.batchrepeatedqueuesize=0' " >> $composefile
echo " entrypoint: sh -c 'echo "+"ring"+" && sleep 16 && ringd start --ethconfig.httphost 0.0.0.0 --mempool.sentryurl sentryring:38003 --mempool.nebulaurl nebula:38004 --mempool.p2purl net:38010 --mempool.cryptourl cryptor:38001 --mempool.checkerurl txchecker:38002 --mempool.writeunreadytxs=false --mempool.writerepeatedmsg=false --mempool.batchconfirminittimeout=600 --mempool.batchconfirmtimeouti=1.5 --mempool.batchrepeatedqueuesize=0 --mempool.batchconfirmenable=false --rpconfig.async=true >>/data/log 2>&1 ' " >> $composefile
else
echo " entrypoint: sh -c 'echo "+"ring"+" && sleep 16 && ringd start --ethconfig.httphost 0.0.0.0 --mempool.sentryurl sentry:38003 --mempool.nebulaurl nebula:38004 --mempool.p2purl net:38010 --mempool.cryptourl cryptor:38001 --mempool.checkerurl txchecker:38002 --mempool.writeunreadytxs=false --mempool.writerepeatedmsg=false --mempool.batchconfirminittimeout=600 --mempool.batchconfirmtimeouti=1.5 --mempool.batchrepeatedqueuesize=0 --mempool.batchconfirmenable=false --rpconfig.async=true >>/data/log 2>&1 ' " >> $composefile echo " entrypoint: sh -c 'echo "+"ring"+" && sleep 16 && ringd start --ethconfig.httphost 0.0.0.0 --mempool.sentryurl sentry:38003 --mempool.nebulaurl nebula:38004 --mempool.p2purl net:38010 --mempool.cryptourl cryptor:38001 --mempool.checkerurl txchecker:38002 --mempool.writeunreadytxs=false --mempool.writerepeatedmsg=false --mempool.batchconfirminittimeout=600 --mempool.batchconfirmtimeouti=1.5 --mempool.batchrepeatedqueuesize=0 --mempool.batchconfirmenable=false --rpconfig.async=true >>/data/log 2>&1 ' " >> $composefile
fi
echo " volumes:" >> $composefile echo " volumes:" >> $composefile
echo " - "$datadir"/ring/:/data" >> $composefile echo " - "$datadir"/ring/:/data" >> $composefile
echo " depends_on:" >> $composefile echo " depends_on:" >> $composefile
echo " - cryptor" >> $composefile echo " - cryptor" >> $composefile
echo " - net" >> $composefile echo " - net" >> $composefile
echo " - sentry" >> $composefile if [ $i -eq 1 ]; then
echo " - sentryring" >> $composefile
else
echo " - sentry" >> $composefile
fi
echo "$resourcering" >> $composefile echo "$resourcering" >> $composefile
echo " ports:" >> $composefile echo " ports:" >> $composefile
echo " - $((28545)):8545" >> $composefile echo " - $((28545)):8545" >> $composefile
......
host/sentry/ring/app.json 0 → 100644
View file @ 44cc2763
{
"contract": "0x614824bF396197024882b45c13E95FbFeAB6621A",
"chain_id": 1024,
"main_account_priv": "2aeab02a323f49acb0346852958a76fb6d94539ad322151b8472329adea5db4d"
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment