Merge pull request #175 from jboss-container-images/revert-172-CLOUD-…

…3471 Revert "Fix for CLOUD-3471, Can't run multiple server during migration"
jboss-container-images · Jan 21, 2020 · fb89185 · fb89185
2 parents 6973b28 + afb6941
commit fb89185
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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