[jboss-svn-commits] JBL Code SVN: r37642 - labs/jbosstm/trunk/XTS/sar/tests/dd/scripts.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Oct 20 11:49:14 EDT 2011
Author: paul.robinson
Date: 2011-10-20 11:49:13 -0400 (Thu, 20 Oct 2011)
New Revision: 37642
Modified:
labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATCrashDuringCommit.txt
labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATCrashDuringOnePhaseCommit.txt
labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATParticipantCrashAndRecover.txt
labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATSubordinateCrashDuringCommit.txt
labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATSubordinateCrashDuringPrepare.txt
labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/BACrashDuringCommit.txt
labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/BACrashDuringOnePhaseCommit.txt
Log:
JBTM-926 Byteman scripts in Crash Recovery tests have wrong expected output
Modified: labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATCrashDuringCommit.txt
===================================================================
--- labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATCrashDuringCommit.txt 2011-10-20 15:48:52 UTC (rev 37641)
+++ labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATCrashDuringCommit.txt 2011-10-20 15:49:13 UTC (rev 37642)
@@ -160,8 +160,11 @@
#
# After the first boot the JVM should exit leaving the following in file testlog
#
+# prepare on non recovered coordinator engine XXXXXX
# prepared received for participant XXXXXX
+# prepare on non recovered coordinator engine XXXXXX
# prepared received for participant XXXXXX
+# prepare on non recovered coordinator engine XXXXXX
# prepared received for participant XXXXXX
# JVM exit
#
@@ -175,9 +178,9 @@
# prepared received for participant XXXXXX
# prepared received for participant XXXXXX
# JVM exit
-# committed received for participant XXXXXX
-# committed received for participant XXXXXX
-# committed received for participant XXXXXX
+# commit on recovered coordinator engine XXXXXX
+# commit on recovered coordinator engine XXXXXX
+# commit on recovered coordinator engine XXXXXX
#
#######################################################################
# This rule opens a file for the trace output during XTS startup
@@ -228,8 +231,8 @@
recovered:boolean = engine.isRecovered(),
identifier:String = engine.getId()
IF NOT recovered
-DO debug("prepare on recovered coordinator engine " + identifier),
- traceln("log", "prepare on recovered coordinator engine " + identifier)
+DO debug("prepare on non recovered coordinator engine " + identifier),
+ traceln("log", "prepare on non recovered coordinator engine " + identifier)
ENDRULE
#######################################################################
@@ -292,7 +295,7 @@
# progressed as expected.
RULE trace prepared replay
-CLASS org.jboss.jbossts.xts.recovery.coordinator.ba.RecoverACCoordinator
+CLASS org.jboss.jbossts.xts.recovery.coordinator.at.RecoverACCoordinator
METHOD replayPhase2
AT INVOKE phase2Commit
BIND coordinator = $0,
Modified: labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATCrashDuringOnePhaseCommit.txt
===================================================================
--- labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATCrashDuringOnePhaseCommit.txt 2011-10-20 15:48:52 UTC (rev 37641)
+++ labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATCrashDuringOnePhaseCommit.txt 2011-10-20 15:49:13 UTC (rev 37642)
@@ -164,9 +164,9 @@
# File testlog written by the participant AS (AS2) should contain output
# in the following format:
#
-# prepare received for participant XXXXXX
-# prepared sent for participant XXXXXX
-# commit received for participant XXXXXX
+# prepare received for participant engine XXXXXX
+# prepared sent for participant engine XXXXXX
+# commit received for participant engine XXXXXX
# JVM exit
#
# After reboot file testlog written by the coordinator AS (AS1) should
@@ -187,8 +187,8 @@
# commit received for participant XXXXXX
# JVM exit
# created recovered participant engine XXXXXX
-# prepared sent for recovered participant XXXXXX
-# rollback received for participant XXXXXX
+# prepared sent for recovered participant engine XXXXXX
+# rollback received for recovered participant XXXXXX
# rollback called for participant XXXXXX
# JVM exit
#
Modified: labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATParticipantCrashAndRecover.txt
===================================================================
--- labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATParticipantCrashAndRecover.txt 2011-10-20 15:48:52 UTC (rev 37641)
+++ labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATParticipantCrashAndRecover.txt 2011-10-20 15:49:13 UTC (rev 37642)
@@ -27,7 +27,7 @@
# JBossTS XTS implementation of the WS-AT 1.1 protocol using orchestration
# rules. The basic scenario employs a client (XTS Service Test program)
# and 2 web services located in one JVM/AS and a coordinator located in another
-# JVM/AS but it is possible for the lcinet and web services to be lcoated in
+# JVM/AS but it is possible for the client and web services to be located in
# separate JVMs/ASs. The scenario is as follows (note ** AS<n> indicates
# intercession by a Byteman rule executed in a specific AS):
#
@@ -204,8 +204,9 @@
identifier:String = engine.getId()
IF (NOT recovered)
AND
- debug("commit on non-recovered participant engine " + identifier)
-DO debug("!!!killing JVM!!!"),
+ traceln("log", "commit on non-recovered participant engine " + identifier)
+DO traceln("log", "JVM exit"),
+ debug("!!!killing JVM!!!"),
killJVM()
ENDRULE
@@ -224,7 +225,7 @@
recovered:boolean = engine.isRecovered(),
identifier:String = engine.getId()
IF recovered
-DO debug("recreated recovered participant engine " + identifier)
+DO traceln("log", "recreated recovered participant engine " + identifier)
ENDRULE
@@ -233,13 +234,13 @@
#######################################################################
# This rule opens a file for the trace output during XTS startup
-RULE open trace file
-CLASS org.jboss.jbossts.XTSService
-METHOD start()
-BIND NOTHING
-IF TRUE
-DO openTrace("log2", "testlog2")
-ENDRULE
+# RULE open trace file
+# CLASS org.jboss.jbossts.XTSService
+# METHOD start()
+# BIND NOTHING
+# IF TRUE
+# DO openTrace("log2", "testlog2")
+# ENDRULE
######################################################################
# This rule is triggered in AS2 when a participant stub
@@ -260,7 +261,7 @@
BIND engine:CoordinatorEngine = $0,
identifier:String = engine.getId()
IF (NOT flagged("firstCommit"))
-DO debug("coordinator waiting for participant to resend prepare" + identifier),
+DO traceln("log", "coordinator waiting for participant to resend prepare" + identifier),
flag("firstCommit"),
waitFor(identifier)
ENDRULE
@@ -291,5 +292,5 @@
IF debug("received committed for participant " + identifier)
AND
signalWake(identifier)
-DO debug("signalled coordinator waiting on " + identifier)
+DO traceln("log", "signalled coordinator waiting on " + identifier)
ENDRULE
Modified: labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATSubordinateCrashDuringCommit.txt
===================================================================
--- labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATSubordinateCrashDuringCommit.txt 2011-10-20 15:48:52 UTC (rev 37641)
+++ labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATSubordinateCrashDuringCommit.txt 2011-10-20 15:49:13 UTC (rev 37642)
@@ -145,12 +145,12 @@
#
# prepare received for participant XXXXXX
# prepared sent for participant XXXXXX
-# prepare received for pseudo participant XXXXXX
+# prepare called for pseudo-participant XXXXXX
+# prepare completed for pseudo-participant XXXXXX
# prepare received for participant XXXXXX
# prepare received for participant XXXXXX
-# prepared sent for participant XXXXXX
-# prepared sent for participant XXXXXX
-# prepared sent for pseudo participant XXXXXX
+# prepared sent for coordinator engine XXXXXX
+# prepared sent for coordinator engine XXXXXX
# JVM exit
#
# n.b. there should be at least one prepared message received for each participant
@@ -162,20 +162,14 @@
# prepare sent for participant engine XXXXXX
# prepare received for participant XXXXXX
# prepared sent for participant XXXXXX
-# prepared received for participant engine XXXXXX
-# prepare sent for participant engine XXXXXX
+# prepare called for pseudo-participant XXXXXX
+# prepare completed for pseudo-participant XXXXXX
# prepare received for participant XXXXXX
# prepare called for pseudo participant XXXXXX
# prepare sent for participant engine XXXXXX
# prepare received for participant XXXXXX
-# prepared sent for participant XXXXXX
-# prepared received for participant engine XXXXXX
-# prepare sent for participant engine XXXXXX
-# prepare received for participant XXXXXX
-# prepared sent for participant XXXXXX
-# prepared received for participant engine XXXXXX
-# prepare completed for pseudo participant XXXXXX
-# prepare received for participant XXXXXX
+# prepared sent for coordinator engine XXXXXX
+# prepared sent for coordinator engine XXXXXX
# JVM exit
# created recovered participant engine XXXXXX
# created recovered participant engine XXXXXX
@@ -185,24 +179,16 @@
# created recovered coordinator engine XXXXXX
# created recovered coordinator engine XXXXXX
# created recovered coordinator engine XXXXXX
-# commit sent for participant engine XXXXXX
-# commit received for participant XXXXXX
-# committed sent for participant XXXXXX
-# committed received for participant engine XXXXXX
-# commit sent for participant engine XXXXXX
-# commit received for participant XXXXXX
-# commit called for pseudo participant XXXXXX
-# commit sent for participant engine XXXXXX
-# commit received for participant XXXXXX
-# committed sent for participant XXXXXX
-# committed received for participant engine XXXXXX
-# commit sent for participant engine XXXXXX
-# commit received for participant XXXXXX
-# committed sent for participant XXXXXX
-# committed received for participant engine XXXXXX
-# commit completed for pseudo participant XXXXXX
-# committed sent for participant XXXXXX
-# committed received for participant engine XXXXXX
+# received commit for recovered participant engine XXXXXX
+# send committed for recovered participant engine XXXXXX
+# received commit for recovered participant engine XXXXXX
+# commit called for pseudo-participant XXXXXX
+# received commit for recovered participant engine XXXXXX
+# send committed for recovered participant engine XXXXXX
+# received commit for recovered participant engine XXXXXX
+# send committed for recovered participant engine XXXXXX
+# commit completed for pseudo-participant XXXXXX
+# send committed for recovered participant engine XXXXXX
# removed committed transaction XXXXXX
# JVM exit
#
@@ -311,10 +297,10 @@
#######################################################################
# This rule is triggered when a subordinate pseudo participant
-# (SubordinateDurable2PCStub) is requested to send a prepared message. It
+# (SubordinateDurable2PCStub) is requested to send a prepare message. It
# traces the call.
-RULE trace subordinate participant stub prepare
+RULE trace subordinate participant stub prepare before
CLASS com.arjuna.wst11.stub.SubordinateDurable2PCStub
METHOD prepare
AT ENTRY
@@ -326,10 +312,10 @@
#######################################################################
# This rule is triggered when a subordinate pseudo participant
-# (SubordinateDurable2PCStub) is requested to send a prepared message. It
+# (SubordinateDurable2PCStub) is requested to send a prepare message. It
# traces the call.
-RULE trace subordinate participant stub prepare 2
+RULE trace subordinate participant stub prepare after
CLASS com.arjuna.wst11.stub.SubordinateDurable2PCStub
METHOD prepare
AFTER INVOKE prepare
@@ -430,7 +416,7 @@
ENDRULE
#######################################################################
-# This rule is triggered when a recovered coordinator engine
+# This rule is triggered when a recovered participant engine
# (ParticipantEngine) receives a commit message. This
# happens during replay of a prepared TX from
# the log. It traces the call.
Modified: labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATSubordinateCrashDuringPrepare.txt
===================================================================
--- labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATSubordinateCrashDuringPrepare.txt 2011-10-20 15:48:52 UTC (rev 37641)
+++ labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATSubordinateCrashDuringPrepare.txt 2011-10-20 15:49:13 UTC (rev 37642)
@@ -168,12 +168,13 @@
# (the number and order of entries depends upon how many and which type of participants
# are enlisted)
#
-# prepare sent for participant XXXXXX
+# prepare sent for Coordinator engine XXXXXX
# prepare received for participant XXXXXX
# prepared sent for participant XXXXXX
-# prepared received for participant XXXXXX
-# prepare sent for participant XXXXXX
+# prepare sent for Coordinator engine XXXXXX
# prepare received for participant XXXXXX
+# prepared sent for participant XXXXXX
+# prepare sent for Coordinator engine XXXXXX
# prepare called for pseudo participant XXXXXX
# prepare sent for participant XXXXXX
# prepare received for participant XXXXXX
@@ -192,12 +193,13 @@
# After reboot the JVM should exit leaving output in the following format in file
# testlog.
#
-# prepare sent for participant XXXXXX
+# prepare sent for Coordinator engine XXXXXX
# prepare received for participant XXXXXX
# prepared sent for participant XXXXXX
-# prepared received for participant XXXXXX
-# prepare sent for participant XXXXXX
+# prepare sent for Coordinator engine XXXXXX
# prepare received for participant XXXXXX
+# prepared sent for participant XXXXXX
+# prepare sent for Coordinator engine XXXXXX
# prepare called for pseudo participant XXXXXX
# prepare sent for participant XXXXXX
# prepare received for participant XXXXXX
@@ -207,34 +209,33 @@
# saved to disk transaction XXXXXX
# prepare returned for pseudo participant XXXXXX
# JVM exit
-# created recovered participant engine XXXXXX
-# created recovered participant engine XXXXXX
-# created recovered participant engine XXXXXX
-# created recovered coordinator engine XXXXXX
-# created recovered coordinator engine XXXXXX
+# created recovered Participant engine XXXXXX
+# created recovered Participant engine XXXXXX
+# created recovered Participant engine XXXXXX
+# created recovered Coordinator engine XXXXXX
+# created recovered Coordinator engine XXXXXX
# reinstated prepared subordinate transaction XXXXXX
#
-# (parallel -- optional and may be repeated depending upon timing)
-# completed sent for participant P2/P3
-# completed received for participant P2/P3
# (parallel)
-# completed sent for participant P1
-# completed received for participant P1
-# rollback sent for participant P1
-# rollback received for participant P1
+# prepared sent for Participant P1
+# prepared received for Coordinator engine P1'
+# rollback sent for Coordinator engine P1
+# rollback received for Participant P1
# (parallel)
-# rollback called for pseudo participant XXXXXX
-# rollback called for subordinate transaction XXX
-# rollback sent for Participant XXXXXX
+
+# rollback called for pseudo-participant XXXXXX
+# rollback called for subordinate coordinator XXX
+# rollback sent for Coordinator engine XXXXXX
# rollback received for Participant XXXXXX
# aborted sent for Participant XXXXXX
-# aborted received for Participant XXXXXX
-# rollback sent for Participant XXXXXX
+# aborted received for Coordinator engine XXXXXX
+# rollback sent for Coordinator engine XXXXXX
# rollback received for Participant XXXXXX
# aborted sent for Participant XXXXXX
-# aborted received for Participant XXXXXX
-# rollback returned for subordinate transaction XXX
-# rollback completed for pseudo participant XXXXXX
+# aborted received for Coordinator engine XXXXXX
+# rollback returned for subordinate coordinator XXX
+# rollback completed for pseudo-participant XXXXXX
+
# removed transaction XXXXXX
# (end parallel)
#
Modified: labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/BACrashDuringCommit.txt
===================================================================
--- labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/BACrashDuringCommit.txt 2011-10-20 15:48:52 UTC (rev 37641)
+++ labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/BACrashDuringCommit.txt 2011-10-20 15:49:13 UTC (rev 37642)
@@ -142,14 +142,14 @@
# org.jboss.jbossts.xts.servicetests.XTSServiceTestName
# to the name of a class which will execute the test. This property must
# be defined in the JVM running the AS to which the xtstest war is deployed
-# i.e. the client AS. n.b. if the client is colocated with the coordinator then
+# i.e. the client AS. n.b. if the client is collocated with the coordinator then
# this property must be left undefined at AS reboot otherwise the client
# will run again, starting a new TX which may interfere with recovery of the
# crashed TX.
#
# Available tests include:
#
-# org.jboss.jbossts.xts.servicetests.test.ba.MultiCoordinatorCompletionParticipantCloseTest
+# org.jboss.jbossts.xts.servicetests.test.ba.MultiParticipantCoordinatorCompletionParticipantCloseTest
# this test invokes a single service registering 3 coordinator completion participants
# and then closing the activity
# the location of service is defined by defining a system property:
@@ -157,7 +157,7 @@
# if this is not set the value used defaults to
# http://localhost:8080/xtstest/xtsservicetest1
#
-# org.jboss.jbossts.xts.servicetests.test.ba.MultiParticipantCompletionParticipantCloseTest
+# org.jboss.jbossts.xts.servicetests.test.ba.MultiParticipantParticipantCompletionParticipantCloseTest
# this test invokes a single service registering 3 participant completion participants
# it sends completed to each of the 3 participants before closing the activity
# the location of service is defined by defining a system property:
@@ -165,7 +165,7 @@
# if this is not set the value used defaults to
# http://localhost:8080/xtstest/xtsservicetest1
#
-# org.jboss.jbossts.xts.servicetests.test.ba.MultiCoordinatorCompletionParticipantExitAndCloseTest
+# org.jboss.jbossts.xts.servicetests.test.ba.MultiParticipantCoordinatorCompletionParticipantExitAndCloseTest
# this test invokes a single service registering 3 coordinator completion participants
# it sends an exit to the first participant before closing the activity
# the location of service is defined by defining a system property:
@@ -173,7 +173,7 @@
# if this is not set the value used defaults to
# http://localhost:8080/xtstest/xtsservicetest1
#
-# org.jboss.jbossts.xts.servicetests.test.ba.MultiParticipantCompletionParticipantExitAndCloseTest
+# org.jboss.jbossts.xts.servicetests.test.ba.MultiParticipantParticipantCompletionParticipantExitAndCloseTest
# this test invokes a single service registering 3 participant completion participants
# it sends an exit to the first participant and completed to the other participants
# before closing the activity
@@ -255,17 +255,15 @@
#
# received exit message for XXXXXXX completion participant stub XXXXXX (only for CloseAndExit tests)
# received completed message for XXXXXXX completion participant stub XXXXXX (number of occcurences depends upon test)
-# received completed message for XXXXXXX completion participant stub XXXXXX
-# received completed message for XXXXXXX completion participant stub XXXXXX
+# complete on recovered XXXXXXX completion participant engine XXXXXXX (number of occcurences depends upon test)
# JVM exit
#
# After reboot the JVM should exit leaving output in the following format in file
# testlog.
#
# received exit message for XXXXXXX completion participant stub XXXXXX (only for CloseAndExit tests)
-# received completed message for XXXXXXX completion participant stub XXXXXX
-# received completed message for XXXXXXX completion participant stub XXXXXX
-# received completed message for XXXXXXX completion participant stub XXXXXX
+# received completed message for XXXXXXX completion participant stub XXXXXX (number of occcurences depends upon test)
+# complete on recovered XXXXXXX completion participant engine XXXXXXX (number of occcurences depends upon test)
# JVM exit
# created recovered XXXXXXX completion participant stub XXXXXX
# created recovered XXXXXXX completion participant stub XXXXXX
@@ -277,7 +275,7 @@
# received closed message for XXXXXXX completion participant stub XXXXXX
# close on recovered XXXXXXX completion participant engine XXXXXX
# received closed message for XXXXXXX completion participant stub XXXXXX
-# removed closed activity XXXXXX
+# removed committed activity XXXXXX
#
#######################################################################
# This rule opens a file for the trace output during XTS startup
@@ -433,13 +431,13 @@
RULE trace participant completion engine create
CLASS com.arjuna.wst11.messaging.engines.ParticipantCompletionCoordinatorEngine
-METHOD <init>(String, boolean, W3CEndpointReference, State, boolean)
+METHOD <init>(String, W3CEndpointReference, State, boolean)
AT ENTRY
BIND identifier = $1,
recovered=$4
IF recovered
DO debug("created recovered participant completion participant stub " + identifier),
- trace("log", "created recovered participant completion participant stub " + identifier)
+ traceln("log", "created recovered participant completion participant stub " + identifier)
ENDRULE
#######################################################################
@@ -451,13 +449,13 @@
RULE trace coordinator completion engine create
CLASS com.arjuna.wst11.messaging.engines.CoordinatorCompletionCoordinatorEngine
-METHOD <init>(String, boolean, W3CEndpointReference, State, boolean)
+METHOD <init>(String, W3CEndpointReference, State, boolean)
AT ENTRY
BIND identifier = $1,
recovered=$4
IF recovered
DO debug("created recovered coordinator completion participant stub " + identifier),
- trace("log", "created recovered coordinator completion participant stub " + identifier)
+ traceln("log", "created recovered coordinator completion participant stub " + identifier)
ENDRULE
#######################################################################
Modified: labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/BACrashDuringOnePhaseCommit.txt
===================================================================
--- labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/BACrashDuringOnePhaseCommit.txt 2011-10-20 15:48:52 UTC (rev 37641)
+++ labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/BACrashDuringOnePhaseCommit.txt 2011-10-20 15:49:13 UTC (rev 37642)
@@ -359,7 +359,7 @@
# participant (CoordinatorCompletionParticipantEngine) receives
# a close message. It exits the JVM, simulating a crash.
-RULE kill JVM at coordinatior completion participant close
+RULE kill JVM at coordinator completion participant close
CLASS com.arjuna.wst11.messaging.engines.CoordinatorCompletionParticipantEngine
METHOD close
AT ENTRY
@@ -536,7 +536,7 @@
recovered=$5
IF recovered
DO debug("created recovered participant completion participant " + identifier),
- trace("log", "created recovered participant completion participant " + identifier)
+ traceln("log", "created recovered participant completion participant " + identifier)
ENDRULE
#######################################################################
@@ -553,7 +553,7 @@
recovered=$5
IF recovered
DO debug("created recovered coordinator completion participant " + identifier),
- trace("log", "created recovered coordinator completion participant " + identifier)
+ traceln("log", "created recovered coordinator completion participant " + identifier)
ENDRULE
#######################################################################
More information about the jboss-svn-commits
mailing list