[jboss-svn-commits] JBL Code SVN: r27534 - in labs/jbosstm/trunk/ArjunaCore/arjuna: tests/classes/com/hp/mwtests/ts/arjuna/recovery and 1 other directory.

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

Author: mark.little at jboss.com
Date: 2009-07-04 09:39:15 -0400 (Sat, 04 Jul 2009)
New Revision: 27534

Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredTransactionScanner.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredTransactionStatusManagerScanner.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/LogMoveTest.java
Log:
https://jira.jboss.org/jira/browse/JBTM-576

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredTransactionScanner.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredTransactionScanner.java	2009-07-04 13:10:59 UTC (rev 27533)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredTransactionScanner.java	2009-07-04 13:39:15 UTC (rev 27534)
@@ -22,24 +22,16 @@
 package com.arjuna.ats.internal.arjuna.recovery;
 
 import java.util.*;
-import java.io.PrintWriter;
-import java.text.*;
 
 import com.arjuna.ats.arjuna.common.Uid;
-import com.arjuna.ats.arjuna.common.arjPropertyManager;
 import com.arjuna.ats.arjuna.objectstore.ObjectStore;
-import com.arjuna.common.util.propertyservice.PropertyManager;
 import com.arjuna.ats.arjuna.recovery.ExpiryScanner;
-import com.arjuna.ats.arjuna.recovery.RecoveryEnvironment;
 import com.arjuna.ats.arjuna.state.InputObjectState;
 import com.arjuna.ats.arjuna.state.OutputObjectState;
 import com.arjuna.ats.arjuna.coordinator.TxControl;
 
 import com.arjuna.ats.arjuna.logging.tsLogger;
-import com.arjuna.ats.arjuna.logging.FacilityCode;
 
-import com.arjuna.common.util.logging.*;
-
 /**
  * This class is a plug-in module for the recovery manager. This class is
  * responsible for the removing transaction status manager items that are too

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredTransactionStatusManagerScanner.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredTransactionStatusManagerScanner.java	2009-07-04 13:10:59 UTC (rev 27533)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredTransactionStatusManagerScanner.java	2009-07-04 13:39:15 UTC (rev 27534)
@@ -32,13 +32,11 @@
 package com.arjuna.ats.internal.arjuna.recovery ;
 
 import java.util.* ;
-import java.io.PrintWriter ;
 import java.text.* ;
 
 import com.arjuna.ats.arjuna.common.Uid ;
 import com.arjuna.ats.arjuna.common.arjPropertyManager;
 import com.arjuna.ats.arjuna.objectstore.ObjectStore ;
-import com.arjuna.common.util.propertyservice.PropertyManager ;
 import com.arjuna.ats.arjuna.recovery.ExpiryScanner ;
 import com.arjuna.ats.arjuna.recovery.RecoveryEnvironment ;
 import com.arjuna.ats.arjuna.state.InputObjectState ;

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/LogMoveTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/LogMoveTest.java	2009-07-04 13:10:59 UTC (rev 27533)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/LogMoveTest.java	2009-07-04 13:39:15 UTC (rev 27534)
@@ -39,6 +39,7 @@
 import com.arjuna.ats.arjuna.recovery.RecoveryEnvironment;
 import com.arjuna.ats.arjuna.recovery.RecoveryManager;
 import com.arjuna.ats.arjuna.state.OutputObjectState;
+import com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionScanner;
 
 import org.junit.Test;
 import static org.junit.Assert.*;
@@ -64,22 +65,14 @@
             if (os.currentState(kungfuTx, tn) == ObjectStore.OS_COMMITTED) {
                 System.err.println("Wrote dummy transaction " + kungfuTx);
 
-                System.setProperty(RecoveryEnvironment.EXPIRY_SCAN_INTERVAL, "1");
-                System.setProperty(Environment.PERIODIC_RECOVERY_PERIOD, "8000000");
+                // quicker to deal with scanner directly
+                
+                ExpiredTransactionScanner scanner = new ExpiredTransactionScanner(tn, "/StateManager/ExpiredEntries");
+                
+                scanner.scan();
+                
+                scanner.scan();
 
-                RecoveryManager manager = RecoveryManager
-                        .manager(RecoveryManager.DIRECT_MANAGEMENT);
-
-                manager.scan();
-
-                try {
-                    Thread.sleep(3600000);
-                }
-                catch (final Exception ex) {
-                }
-
-                manager.scan();
-
                 if (os.currentState(kungfuTx, tn) == ObjectStore.OS_COMMITTED)
                     System.err.println("Transaction log not moved!");
                 else {