move server PID and Shutdown Marker files to server log directory

Author: pfmackin

operator/src/main/resources/scripts/startNodeManager.sh

@@ -104,6 +104,8 @@ else
   # setup ".out" location for a WL server
   serverLogHome="${LOG_HOME:-${DOMAIN_HOME}/servers/${SERVER_NAME}/logs}"
   export SERVER_OUT_FILE="${serverLogHome}/${SERVER_NAME}.out"
+  export SERVER_PID_FILE="${serverLogHome}/${SERVER_NAME}.pid"
+  export SHUTDOWN_MARKER_FILE="${serverLogHome}/${SERVER_NAME}.shutdown"
   serverOutOption="-Dweblogic.Stdout=${SERVER_OUT_FILE}"
   createFolder "${serverLogHome}"
 fi

operator/src/main/resources/scripts/startServer.sh

@@ -72,7 +72,7 @@ function startWLS() {
 
   trace "Start node manager"
   # call script to start node manager in same shell
-  # $SERVER_OUT_FILE will be set in startNodeManager.sh
+  # $SERVER_OUT_FILE, SERVER_PID_FILE, and SHUTDOWN_MARKER_FILE will be set in startNodeManager.sh
   . ${SCRIPTPATH}/startNodeManager.sh
   [ $? -ne 0 ] && trace SEVERE "failed to start node manager" && exitOrLoop
 
@@ -103,7 +103,7 @@ function waitUntilShutdown() {
   #
   if [ "${SERVER_OUT_IN_POD_LOG}" == 'true' ] ; then
     trace "Showing the server out file from ${SERVER_OUT_FILE}"
-    ${SCRIPTPATH}/tailLog.sh ${SERVER_OUT_FILE} &
+    ${SCRIPTPATH}/tailLog.sh ${SERVER_OUT_FILE} ${SERVER_PID_FILE} &
   fi
   FAIL_BOOT_ON_SITUATIONAL_CONFIG_ERROR=${FAIL_BOOT_ON_SITUATIONAL_CONFIG_ERROR:-true} 
   SERVER_OUT_MONITOR_INTERVAL=${SERVER_OUT_MONITOR_INTERVAL:-3}
@@ -119,7 +119,7 @@ function waitForShutdownMarker() {
   #
   trace "Wait indefinitely so that the Kubernetes pod does not exit and try to restart"
   while true; do
-    if [ -e /tmp/doShutdown ] ; then
+    if [ -e ${SHUTDOWN_MARKER_FILE} ] ; then
       exit 0
     fi
     sleep 3

operator/src/main/resources/scripts/stop-server.py

@@ -107,12 +107,20 @@ def waitUntilCoherenceSafe():
   print ('Shutdown: getting all service Coherence MBeans')
   query='Coherence:type=PartitionAssignment,service=*,*'
 
+  # By default, Coherence will use a single Weblogic Runtime MBean server to managed
+  # its MBeans.  That server will correspond to the current Coherence senior member,
+  # which means that the Coherence MBeans will migrate to the oldest cluster member
+  # during rolling restart.  By using the DomainRuntime MBean server (in admin server)
+  # we can get access to the Coherence MBeans, regardless of the local Runtime MBean
+  # server being used, since the DomainRuntime server is federated and will call the
+  # individual MBean servers to get the MBeans througout the domain.
+  domainRuntime()
+
   # Wait forever until we get positive ack that it is ok to shutdown this server.
   done = False
   warnSleep = True
   while (not done):
     try:
-      domainRuntime()
       beans = list(mbs.queryMBeans(ObjectName(query), None))
       if beans is None or len(beans) == 0:
         # during rolling restart the beans might not be available right away

operator/src/main/resources/scripts/stopServer.sh

@@ -16,13 +16,16 @@ source ${SCRIPTPATH}/utils.sh
 # setup ".out" location for a WL server
 serverLogHome="${LOG_HOME:-${DOMAIN_HOME}/servers/${SERVER_NAME}/logs}"
 STOP_OUT_FILE="${serverLogHome}/${SERVER_NAME}.stop.out"
+SHUTDOWN_MARKER_FILE="${serverLogHome}/${SERVER_NAME}.shutdown"
+SERVER_PID_FILE="${serverLogHome}/${SERVER_NAME}.pid"
+
 
 trace "Stop server ${SERVER_NAME}" &>> ${STOP_OUT_FILE}
 
 checkEnv SERVER_NAME || exit 1
 
 if [ "${MOCK_WLS}" == 'true' ]; then
-  touch /weblogic-operator/doShutdown
+  touch ${SHUTDOWN_MARKER_FILE}
   exit 0
 fi
 
@@ -79,9 +82,10 @@ if [ ! -z $pid ]; then
   kill -15 $pid
 fi
 
-touch /tmp/doShutdown
-if [ -f /weblogic-operator/pid ]; then
-  kill -2 $(</weblogic-operator/pid)
+touch ${SHUTDOWN_MARKER_FILE}
+
+if [ -f ${SERVER_PID_FILE} ]; then
+  kill -2 $(< ${SERVER_PID_FILE} )
 fi
 
 trace "Exit script"  &>> ${STOP_OUT_FILE}

operator/src/main/resources/scripts/tailLog.sh

@@ -10,5 +10,5 @@
 # running this script.
 #
 
-echo $$ > /tmp/tailLog-pid
+echo $$ > $2
 tail -F -n +0 $1