From afb6941f4380f5359f8aa61c65746ee2e47b0828 Mon Sep 17 00:00:00 2001 From: Jeff Mesnil Date: Tue, 21 Jan 2020 16:23:29 +0100 Subject: [PATCH] Revert "Fix for CLOUD-3471, Can't run multiple server during migration" --- os-eap-migration/added/launch/openshift-migrate-common.sh | 4 ++++ os-eap-txnrecovery/bash/added/partitionPV.sh | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/os-eap-migration/added/launch/openshift-migrate-common.sh b/os-eap-migration/added/launch/openshift-migrate-common.sh index 508fbc6c..81ea40e9 100644 --- a/os-eap-migration/added/launch/openshift-migrate-common.sh +++ b/os-eap-migration/added/launch/openshift-migrate-common.sh @@ -1,6 +1,7 @@ #!/bin/sh # Openshift EAP common migration script +source ${JBOSS_HOME}/bin/launch/launch.sh source ${JBOSS_HOME}/bin/probe_common.sh source /opt/partition/partitionPV.sh @@ -14,6 +15,9 @@ function runMigration() { cp -f ${STANDALONE_XML_COPY} ${STANDALONE_XML} + # exposed by wildfly-cekit-modules + configure_server + echo "Running $JBOSS_IMAGE_NAME image, version $JBOSS_IMAGE_VERSION" local txOptions="-Dcom.arjuna.ats.arjuna.common.RecoveryEnvironmentBean.recoveryBackoffPeriod=1 -Dcom.arjuna.ats.arjuna.common.RecoveryEnvironmentBean.periodicRecoveryPeriod=1 -Dcom.arjuna.ats.jta.common.JTAEnvironmentBean.orphanSafetyInterval=1" diff --git a/os-eap-txnrecovery/bash/added/partitionPV.sh b/os-eap-txnrecovery/bash/added/partitionPV.sh index 95cc3e06..d71cb180 100644 --- a/os-eap-txnrecovery/bash/added/partitionPV.sh +++ b/os-eap-txnrecovery/bash/added/partitionPV.sh @@ -174,11 +174,6 @@ function migratePV() { done fi - # server can only be configured once due to CLI script being executed - # doing it before the loop that will start a server per directory. - source $JBOSS_HOME/bin/launch/launch.sh - configure_server - while true ; do if $IS_TX_SQL_BACKEND; then