[jboss-svn-commits] JBL Code SVN: r37800 - in labs/jbosstm/branches/JBOSSTS_4_16: atsintegration/tests/classes/com/arjuna/ats/jta/distributed and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: tomjenkinson
Date: 2011-12-14 16:28:34 -0500 (Wed, 14 Dec 2011)
New Revision: 37800

Modified:
   labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java
   labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/SimpleIsolatedServers.java
   labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/TestResourceRecovery.java
Log:
JBTM-895 updated to always call bottomUpRecovery when server is not bounced and subordinate calls recover before we have chance to

Modified: labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java	2011-12-14 19:33:27 UTC (rev 37799)
+++ labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java	2011-12-14 21:28:34 UTC (rev 37800)
@@ -192,9 +192,10 @@
 
 	private XAResource getNewXAResource(Xid xid)
 	{
-		if (_xidScans == null) {
+		// JBTM-895 updated to always call bottomUpRecovery when server is not bounced and subordinate calls recover before we have chance to
+//		if (_xidScans == null) {
 			bottomUpRecovery();
-        }
+//        }
 
         if (_xidScans != null)
 		{

Modified: labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/SimpleIsolatedServers.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/SimpleIsolatedServers.java	2011-12-14 19:33:27 UTC (rev 37799)
+++ labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/SimpleIsolatedServers.java	2011-12-14 21:28:34 UTC (rev 37800)
@@ -68,8 +68,6 @@
 	@BeforeClass
 	public static void setup() throws SecurityException, NoSuchMethodException, InstantiationException, IllegalAccessException, ClassNotFoundException,
 			CoreEnvironmentBeanException, IOException, IllegalArgumentException, NoSuchFieldException {
-		completionCounter.reset();
-		lookupProvider.clear();
 		for (int i = 0; i < serverNodeNames.length; i++) {
 			boot(i);
 		}
@@ -83,6 +81,8 @@
 			localServers[i].shutdown();
 			Thread.currentThread().setContextClassLoader(contextClassLoader);
 		}
+		completionCounter.reset();
+		lookupProvider.clear();
 	}
 
 	private static void reboot(String serverName) throws Exception {
@@ -236,8 +236,11 @@
 				phase2CommitAborted.wait();
 			}
 		}
-		tearDown();
-		setup();
+
+		reboot("1000");
+		reboot("2000");
+		reboot("3000");
+		
 		assertTrue(completionCounter.getCommitCount("2000") == 0);
 		assertTrue(completionCounter.getRollbackCount("2000") == 0);
 		assertTrue(completionCounter.getCommitCount("1000") == 0);
@@ -249,17 +252,12 @@
 		assertTrue(completionCounter.getRollbackCount("2000") == 1);
 
 		System.out.println("RECOVERING SECOND SERVER");
-		tearDown();
-		setup();
-		assertTrue(completionCounter.getCommitCount("2000") == 0);
-		assertTrue(completionCounter.getRollbackCount("2000") == 0);
-		assertTrue(completionCounter.getCommitCount("1000") == 0);
-		assertTrue(completionCounter.getRollbackCount("1000") == 0);
+		
 		getLocalServer("1000").doRecoveryManagerScan(true);
 		assertTrue(completionCounter.getCommitCount("1000") == 0);
-		assertTrue(completionCounter.getRollbackCount("1000") == 1);
+		assertTrue(completionCounter.getRollbackCount("1000") == 3);
 		assertTrue(completionCounter.getCommitCount("2000") == 0);
-		assertTrue(completionCounter.getRollbackCount("2000") == 2);
+		assertTrue("Server 2000 rollback count: " + completionCounter.getRollbackCount("2000"), completionCounter.getRollbackCount("2000") == 3);
 
 	}
 
@@ -319,8 +317,11 @@
 				phase2CommitAborted.wait();
 			}
 		}
-		tearDown();
-		setup();
+
+		reboot("1000");
+		reboot("2000");
+		reboot("3000");
+		
 		{
 
 			assertTrue(completionCounter.getCommitCount("2000") == 0);
@@ -403,8 +404,11 @@
 				phase2CommitAborted.wait();
 			}
 		}
-		tearDown();
-		setup();
+
+		reboot("1000");
+		reboot("2000");
+		reboot("3000");
+		
 		{
 
 			assertTrue(completionCounter.getCommitCount("2000") == 0);
@@ -492,8 +496,9 @@
 				phase2CommitAborted.wait();
 			}
 		}
-		tearDown();
-		setup();
+		reboot("1000");
+		reboot("2000");
+		reboot("3000");
 		assertTrue(completionCounter.getCommitCount("2000") == 0);
 		assertTrue(completionCounter.getRollbackCount("2000") == 0);
 		assertTrue(completionCounter.getCommitCount("1000") == 0);
@@ -633,8 +638,11 @@
 				phase2CommitAborted.wait();
 			}
 		}
-		tearDown();
-		setup();
+
+		reboot("1000");
+		reboot("2000");
+		reboot("3000");
+		
 		getLocalServer("1000").doRecoveryManagerScan(false);
 
 		assertTrue(completionCounter.getCommitCount("1000") == 4);

Modified: labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/TestResourceRecovery.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/TestResourceRecovery.java	2011-12-14 19:33:27 UTC (rev 37799)
+++ labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/TestResourceRecovery.java	2011-12-14 21:28:34 UTC (rev 37800)
@@ -45,6 +45,7 @@
 				File currentFile = listFiles[i];
 				if (currentFile.getAbsolutePath().endsWith("_")) {
 					resources.add(new TestResource(nodeName, currentFile));
+					System.out.println("Added TestResource: " + currentFile.getName());
 				}
 			}
 		}