Synchrony.core isn't killed with Confluence

Summary

When Tomcat isn't shutdown gracefully, the PID of the Synchrony JVM isn't killed with Confluence's PID. The problem was first reported in https://jira.atlassian.com/browse/CONFSERVER-43741 but this is still an issue in case Confluence's PID is killed by catalina.sh

Steps to Reproduce

1. Start Confluence.
2. Install some add-ons so Confluence takes more than 30s to be shutdown.
3. Shutdown Confluence.

Expected Results

When Confluence's PID is killed, Synchrony's PID should also be killed.

Actual Results

Only Confluence's PID is killed, letting the Synchrony JVM up and running. The bug is only triggered when the following message appears:

Tomcat did not stop in time.
To aid diagnostics a thread dump has been written to standard out.
Killing Tomcat with the PID: XXXX
The Tomcat process has been killed.

Workaround

• You can edit the catalina.sh:
  1. Stop Confluence.
  2. Edit the catalina.sh file(found inside of the /bin directory).
  3. Locate the following strings:

           if [ -f "$CATALINA_PID" ]; then
             PID=`cat "$CATALINA_PID"`
             echo "Killing Tomcat with the PID: $PID"
             kill -9 $PID
     

  4. Insert the following:

             SYNC_PID="`cat $CATALINA_BASE/temp/synchrony.pid`"
             echo "Killing Synchrony with the PID: $SYNC_PID"
             kill -9 $SYNC_PID
     

  5. It will look like:

           if [ -f "$CATALINA_PID" ]; then
             SYNC_PID="`cat $CATALINA_BASE/temp/synchrony.pid`"
             echo "Killing Synchrony with the PID: $SYNC_PID"
             kill -9 $SYNC_PID
             PID=`cat "$CATALINA_PID"`
             echo "Killing Tomcat with the PID: $PID"
             kill -9 $PID
     

  6. Save the changes and start Confluence
• You can manually kill -9 Synchrony's PID.