Skip to content

Commit afb6941

Browse files
authored
Revert "Fix for CLOUD-3471, Can't run multiple server during migration"
1 parent 6973b28 commit afb6941

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

os-eap-migration/added/launch/openshift-migrate-common.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/sh
22
# Openshift EAP common migration script
33

4+
source ${JBOSS_HOME}/bin/launch/launch.sh
45
source ${JBOSS_HOME}/bin/probe_common.sh
56
source /opt/partition/partitionPV.sh
67

@@ -14,6 +15,9 @@ function runMigration() {
1415

1516
cp -f ${STANDALONE_XML_COPY} ${STANDALONE_XML}
1617

18+
# exposed by wildfly-cekit-modules
19+
configure_server
20+
1721
echo "Running $JBOSS_IMAGE_NAME image, version $JBOSS_IMAGE_VERSION"
1822

1923
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"

os-eap-txnrecovery/bash/added/partitionPV.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,6 @@ function migratePV() {
174174
done
175175
fi
176176

177-
# server can only be configured once due to CLI script being executed
178-
# doing it before the loop that will start a server per directory.
179-
source $JBOSS_HOME/bin/launch/launch.sh
180-
configure_server
181-
182177
while true ; do
183178

184179
if $IS_TX_SQL_BACKEND; then

0 commit comments

Comments
 (0)