adding --force to asadmin stop-domain

IQSS · Aug 29, 2024 · c3bc347 · c3bc347
1 parent 025b55d
commit c3bc347
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/deploy_beta_testing.yml b/.github/workflows/deploy_beta_testing.yml
@@ -76,10 +76,10 @@ jobs:
             APPLICATION_NAME=dataverse-backend
             ASADMIN='/usr/local/payara6/bin/asadmin --user admin'
             $ASADMIN undeploy $APPLICATION_NAME
-            $ASADMIN stop-domain
+            $ASADMIN stop-domain --force
             rm -rf /usr/local/payara6/glassfish/domains/domain1/generated
             rm -rf /usr/local/payara6/glassfish/domains/domain1/osgi-cache
             $ASADMIN start-domain
             $ASADMIN deploy --name $APPLICATION_NAME $INPUT_WAR_FILE
-            $ASADMIN stop-domain
+            $ASADMIN stop-domain --force
             $ASADMIN start-domain
diff --git a/doc/sphinx-guides/source/_static/installation/files/etc/systemd/payara.service b/doc/sphinx-guides/source/_static/installation/files/etc/systemd/payara.service
@@ -5,7 +5,7 @@ After = syslog.target network.target
 [Service]
 Type = forking
 ExecStart = /usr/bin/java -jar /usr/local/payara6/glassfish/lib/client/appserver-cli.jar start-domain
-ExecStop = /usr/bin/java -jar /usr/local/payara6/glassfish/lib/client/appserver-cli.jar stop-domain
+ExecStop = /usr/bin/java -jar /usr/local/payara6/glassfish/lib/client/appserver-cli.jar stop-domain --force
 ExecReload = /usr/bin/java -jar /usr/local/payara6/glassfish/lib/client/appserver-cli.jar restart-domain
 User=dataverse
 LimitNOFILE=32768

diff --git a/doc/sphinx-guides/source/_static/util/clear_timer.sh b/doc/sphinx-guides/source/_static/util/clear_timer.sh
@@ -14,7 +14,7 @@ PAYARA_DIR=/usr/local/payara6
 DV_DIR=${PAYARA_DIR}/glassfish/domains/domain1
 
 # stop the domain (generates a warning if app server is stopped)
-${PAYARA_DIR}/bin/asadmin stop-domain
+${PAYARA_DIR}/bin/asadmin stop-domain --force
 
 rm -rf ${PAYARA_DIR}/${DV_DIR}/generated/
 rm -rf ${PAYARA_DIR}/${DV_DIR}/osgi-cache/

diff --git a/doc/sphinx-guides/source/developers/testing.rst b/doc/sphinx-guides/source/developers/testing.rst
@@ -365,7 +365,7 @@ Note that we are running the following commands as the user "dataverse". In shor
   cd local/jacoco-0.8.1
   wget https://github.com/jacoco/jacoco/releases/download/v0.8.1/jacoco-0.8.1.zip
   unzip jacoco-0.8.1.zip
-  /usr/local/payara6/bin/asadmin stop-domain
+  /usr/local/payara6/bin/asadmin stop-domain --force
   cp /home/dataverse/local/jacoco-0.8.1/lib/jacocoagent.jar /usr/local/payara6/glassfish/lib
   /usr/local/payara6/bin/asadmin start-domain
 
@@ -403,7 +403,7 @@ Note that "/usr/local/payara6/glassfish/domains/domain1/config/jacoco.exec" will
 
 .. code-block:: bash
 
-  /usr/local/payara6/bin/asadmin stop-domain
+  /usr/local/payara6/bin/asadmin stop-domain --force
   /usr/local/payara6/bin/asadmin start-domain
   git clone https://github.com/IQSS/dataverse.git
   cd dataverse

diff --git a/modules/container-base/src/main/docker/Dockerfile b/modules/container-base/src/main/docker/Dockerfile
@@ -227,7 +227,7 @@ RUN <<EOF
 
     ### CLEANUP
     # Stop domain
-    ${ASADMIN} stop-domain "${DOMAIN_NAME}"
+    ${ASADMIN} stop-domain --force "${DOMAIN_NAME}"
     # Disable JSP servlet dynamic reloads
     sed -i 's#<servlet-class>org.glassfish.wasp.servlet.JspServlet</servlet-class>#<servlet-class>org.glassfish.wasp.servlet.JspServlet</servlet-class>\n    <init-param>\n      <param-name>development</param-name>\n      <param-value>false</param-value>\n    </init-param>\n    <init-param>\n      <param-name>genStrAsCharArray</param-name>\n      <param-value>true</param-value>\n    </init-param>#' "${DOMAIN_DIR}/config/default-web.xml"
     # Cleanup old CA certificates to avoid unnecessary log clutter during startup

diff --git a/scripts/installer/as-setup.sh b/scripts/installer/as-setup.sh
@@ -318,7 +318,7 @@ fi
 # Restart
 echo Updates done. Restarting...
 # encountered cases where `restart-domain` timed out, but `stop` -> `start` didn't.
-./asadmin $ASADMIN_OPTS stop-domain $GLASSFISH_DOMAIN
+./asadmin $ASADMIN_OPTS stop-domain --force $GLASSFISH_DOMAIN
 ./asadmin $ASADMIN_OPTS start-domain $GLASSFISH_DOMAIN
 
 ###