-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Broker/Server separate configs (#166)
Add automatic recovery for api/dual node Merged both start scripts. Replaced mustache for basic script that could be used when not running compose. Co-authored-by: wayonb <[email protected]>
- Loading branch information
Showing
33 changed files
with
272 additions
and
180 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| #!/bin/bash | ||
| set -e | ||
|
|
||
| function try() | ||
| { | ||
| [[ $- = *e* ]]; SAVED_OPT_E=$? | ||
| set +e | ||
| } | ||
|
|
||
| function throw() | ||
| { | ||
| exit $1 | ||
| } | ||
|
|
||
| function catch() | ||
| { | ||
| export ex_code=$? | ||
| (( $SAVED_OPT_E )) && set +e | ||
| return $ex_code | ||
| } | ||
|
|
||
| catapultAppFolder=$1 | ||
| dataDirectory=$2 | ||
| application=$3 | ||
| theOtherApplication=$4 | ||
| mode=$5 | ||
| name=$6 | ||
| waitForOther=$7 | ||
| config="./$application-config" | ||
|
|
||
| echo "RUNNING $application $name $mode" | ||
| export LD_LIBRARY_PATH=$catapultAppFolder/lib:$catapultAppFolder/deps | ||
|
|
||
| ulimit -c unlimited | ||
|
|
||
| rm -f "$dataDirectory/$application.started" | ||
| rm -f "$dataDirectory/$application-recovery.started" | ||
|
|
||
| if [ "$mode" == "DEBUG" ]; then | ||
| echo "Setting up core dump..." | ||
| mkdir -p ./logs | ||
| echo "./logs/$application.%e.%t" >/proc/sys/kernel/core_pattern | ||
| fi | ||
|
|
||
| otherApplicationRecoveryFile="$dataDirectory/$theOtherApplication-recovery.started" | ||
| while [ -f $otherApplicationRecoveryFile ] ; | ||
| do | ||
| echo "Waiting for $theOtherApplication recovery to finish" | ||
| sleep 1 | ||
| done | ||
|
|
||
|
|
||
| if [ -e "$dataDirectory/$application.lock" ]; then | ||
| echo "!!!! Have lock file present, going to run recovery in $application mode...." | ||
|
|
||
| touch "$dataDirectory/$application-recovery.started" | ||
|
|
||
| while [ -f "$dataDirectory/$theOtherApplication.started" ] ; | ||
| do | ||
| echo "Waiting for $theOtherApplication to exit" | ||
| sleep 1 | ||
| done | ||
|
|
||
| try | ||
| ( | ||
| set -e | ||
| $catapultAppFolder/bin/catapult.recovery "$config" | ||
| echo "!!!! Finished running recovery, should be moving on to start $application..." | ||
| ) | ||
| # directly after closing the subshell you need to connect a group to the catch using || | ||
| catch || { | ||
| echo "!!!! $application recovery has CRASHED!" | ||
| rm -f "$dataDirectory/$application-recovery.started" | ||
| throw $ex_code # you can rethrow the "exception" causing the script to exit if not caught | ||
| } | ||
| fi | ||
|
|
||
| rm -f "$dataDirectory/$application-recovery.started" | ||
|
|
||
| if [ "$waitForOther" == "true" ]; then | ||
| while [ ! -f "$dataDirectory/$theOtherApplication.started" ] ; | ||
| do | ||
| echo "Waiting for $theOtherApplication to start" | ||
| sleep 1 | ||
| done | ||
| fi | ||
|
|
||
| touch "$dataDirectory/$application.started" | ||
|
|
||
| processName="catapult.$application" | ||
| echo "!!!! Starting $application...." | ||
| $catapultAppFolder/bin/$processName "$config" & | ||
| export applicationPid=$! | ||
|
|
||
| cleanup() { | ||
| echo "Shutting down $application" | ||
| kill -s SIGTERM $applicationPid | ||
| wait $applicationPid | ||
| exitStatus=$? | ||
| rm -f "./data/$application.started" | ||
| exit $exitStatus | ||
| } | ||
|
|
||
| #Trap SIGTERM | ||
| trap 'cleanup' SIGTERM SIGINT | ||
|
|
||
| while sleep 5; do | ||
| ps aux |grep $processName |grep -q -v grep | ||
| processStatus=$? | ||
| if [ $processStatus -ne 0 ]; then | ||
| echo "The process $processName has already exited." | ||
| wait $applicationPid | ||
| exitStatus=$? | ||
| rm -f "./data/$application.started" | ||
| exit $exitStatus | ||
| fi | ||
|
|
||
| if [ -e $otherApplicationRecoveryFile ]; then | ||
| echo "Other process waiting for recovery. Shutting down $application" | ||
| kill -s SIGTERM $applicationPid | ||
| wait $applicationPid | ||
| rm -f "./data/$application.started" | ||
| exit 1 | ||
| fi | ||
| done |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
9 changes: 5 additions & 4 deletions
9
config/node/resources/config-extensions-recovery.properties.mustache
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,9 @@ | ||
| [extensions] | ||
|
|
||
| # addressextraction must be first because mongo and zeromq depend on extracted addresses | ||
| extension.addressextraction = {{addressextraction}} | ||
| extension.mongo = {{mongo}} | ||
| extension.zeromq = {{zeromq}} | ||
| extension.addressextraction = {{addressextractionRecovery}} | ||
| extension.mongo = {{mongoRecovery}} | ||
| extension.zeromq = {{zeromqRecovery}} | ||
|
|
||
| extension.hashcache = true | ||
| extension.filespooling = {{filespoolingRecovery}} | ||
| extension.hashcache = {{hashcacheRecovery}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.