From c3bc347d3666c14b25a24c063a1d2608f09ee492 Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Thu, 29 Aug 2024 14:49:18 -0400 Subject: [PATCH] adding --force to asadmin stop-domain --- .github/workflows/deploy_beta_testing.yml | 4 ++-- .../_static/installation/files/etc/systemd/payara.service | 2 +- doc/sphinx-guides/source/_static/util/clear_timer.sh | 2 +- doc/sphinx-guides/source/developers/testing.rst | 4 ++-- modules/container-base/src/main/docker/Dockerfile | 2 +- scripts/installer/as-setup.sh | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy_beta_testing.yml b/.github/workflows/deploy_beta_testing.yml index 028f0140cc9..6c16cea6bab 100644 --- 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 index c8efcb9c6f9..591adc7e20a 100644 --- 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 index 641b2695084..eb8c59fef9e 100755 --- 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 index 3910a40b118..f14ea81b07a 100755 --- 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 index 29078e6896c..f865f5aed7f 100644 --- a/modules/container-base/src/main/docker/Dockerfile +++ b/modules/container-base/src/main/docker/Dockerfile @@ -227,7 +227,7 @@ RUN <org.glassfish.wasp.servlet.JspServlet#org.glassfish.wasp.servlet.JspServlet\n \n development\n false\n \n \n genStrAsCharArray\n true\n #' "${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 index e87122ba77c..9e86b087d40 100755 --- 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 ###