[jboss-svn-commits] JBL Code SVN: r29444 - labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Sep 23 11:07:32 EDT 2009
Author: mark.little at jboss.com
Date: 2009-09-23 11:07:31 -0400 (Wed, 23 Sep 2009)
New Revision: 29444
Modified:
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client04b.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client05b.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client06b.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client12b.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client13b.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client14b.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client15b.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client16b.java
Log:
https://jira.jboss.org/jira/browse/JBTM-605
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client04b.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client04b.java 2009-09-23 14:09:51 UTC (rev 29443)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client04b.java 2009-09-23 15:07:31 UTC (rev 29444)
@@ -62,6 +62,7 @@
import org.jboss.jbossts.qa.Utils.ORBInterface;
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.omg.CosTransactions.*;
public class Client04b
{
@@ -96,7 +97,21 @@
correct = correct && service1.is_correct();
correct = correct && service2.is_correct();
- OTS.current().commit(false);
+ /*
+ * Two resources registered through interposition appear as a single
+ * resource (the subordinate) to the parent. So 1PC is attempted and
+ * this throws a heuristic due to crash in commit of one resource. Previously
+ * we had to assume committed was the outcome, but we really don't know and
+ * can now raise that to the client.
+ */
+
+ try
+ {
+ OTS.current().commit(false);
+ }
+ catch (final HeuristicHazard ex)
+ {
+ }
if (correct)
{
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client05b.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client05b.java 2009-09-23 14:09:51 UTC (rev 29443)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client05b.java 2009-09-23 15:07:31 UTC (rev 29444)
@@ -62,6 +62,7 @@
import org.jboss.jbossts.qa.Utils.ORBInterface;
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.omg.CosTransactions.*;
public class Client05b
{
@@ -96,7 +97,21 @@
correct = correct && service1.is_correct();
correct = correct && service2.is_correct();
- OTS.current().commit(false);
+ /*
+ * Two resources registered through interposition appear as a single
+ * resource (the subordinate) to the parent. So 1PC is attempted and
+ * this throws a heuristic due to crash in commit of one resource. Previously
+ * we had to assume committed was the outcome, but we really don't know and
+ * can now raise that to the client.
+ */
+
+ try
+ {
+ OTS.current().commit(false);
+ }
+ catch (final HeuristicHazard ex)
+ {
+ }
if (correct)
{
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client06b.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client06b.java 2009-09-23 14:09:51 UTC (rev 29443)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client06b.java 2009-09-23 15:07:31 UTC (rev 29444)
@@ -62,6 +62,7 @@
import org.jboss.jbossts.qa.Utils.ORBInterface;
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.omg.CosTransactions.*;
public class Client06b
{
@@ -96,7 +97,13 @@
correct = correct && service1.is_correct();
correct = correct && service2.is_correct();
- OTS.current().commit(false);
+ try
+ {
+ OTS.current().commit(false);
+ }
+ catch (final HeuristicHazard ex)
+ {
+ }
if (correct)
{
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client12b.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client12b.java 2009-09-23 14:09:51 UTC (rev 29443)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client12b.java 2009-09-23 15:07:31 UTC (rev 29444)
@@ -63,6 +63,7 @@
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
+import org.omg.CosTransactions.*;
public class Client12b
{
@@ -96,11 +97,21 @@
correct = correct && service1.is_correct();
correct = correct && service2.is_correct();
-
+
+ /*
+ * Prepare followed by a crash should eventually resolve to
+ * a rollback, but we have no way of communicating that to the
+ * root coordinator or guaranteeing it anyway. So heuristic outcomes
+ * are the only option now.
+ */
+
try
{
OTS.current().commit(false);
}
+ catch (final HeuristicHazard ex)
+ {
+ }
catch (TRANSACTION_ROLLEDBACK transactionRolledback)
{
}
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client13b.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client13b.java 2009-09-23 14:09:51 UTC (rev 29443)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client13b.java 2009-09-23 15:07:31 UTC (rev 29444)
@@ -63,6 +63,7 @@
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
+import org.omg.CosTransactions.*;
public class Client13b
{
@@ -101,6 +102,9 @@
{
OTS.current().commit(false);
}
+ catch (final HeuristicHazard ex)
+ {
+ }
catch (TRANSACTION_ROLLEDBACK transactionRolledback)
{
}
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client14b.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client14b.java 2009-09-23 14:09:51 UTC (rev 29443)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client14b.java 2009-09-23 15:07:31 UTC (rev 29444)
@@ -63,6 +63,7 @@
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
+import org.omg.CosTransactions.*;
public class Client14b
{
@@ -101,6 +102,9 @@
{
OTS.current().commit(false);
}
+ catch (final HeuristicHazard ex)
+ {
+ }
catch (TRANSACTION_ROLLEDBACK transactionRolledback)
{
}
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client15b.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client15b.java 2009-09-23 14:09:51 UTC (rev 29443)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client15b.java 2009-09-23 15:07:31 UTC (rev 29444)
@@ -63,6 +63,7 @@
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
+import org.omg.CosTransactions.*;
public class Client15b
{
@@ -101,6 +102,9 @@
{
OTS.current().commit(false);
}
+ catch (final HeuristicHazard ex)
+ {
+ }
catch (TRANSACTION_ROLLEDBACK transactionRolledback)
{
}
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client16b.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client16b.java 2009-09-23 14:09:51 UTC (rev 29443)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client16b.java 2009-09-23 15:07:31 UTC (rev 29444)
@@ -63,6 +63,7 @@
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
+import org.omg.CosTransactions.*;
public class Client16b
{
@@ -101,6 +102,9 @@
{
OTS.current().commit(false);
}
+ catch (final HeuristicHazard ex)
+ {
+ }
catch (TRANSACTION_ROLLEDBACK transactionRolledback)
{
}
More information about the jboss-svn-commits
mailing list