JBTM-3273 -> Implemented code review comments

jbosstm · Apr 16, 2020 · 824af49 · 824af49
1 parent 46366bd
commit 824af49
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 49 deletions.
diff --git a/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java b/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java
@@ -41,6 +41,7 @@
 import java.util.Set;
 import java.util.Vector;
 import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.transaction.xa.XAException;
@@ -59,7 +60,6 @@
 import com.arjuna.ats.internal.arjuna.common.UidHelper;
 import com.arjuna.ats.internal.jta.resources.arjunacore.XAResourceRecord;
 import com.arjuna.ats.jta.common.jtaPropertyManager;
-import com.arjuna.ats.jta.logging.RecoveryRequired;
 import com.arjuna.ats.jta.logging.jtaLogger;
 import com.arjuna.ats.jta.recovery.SerializableXAResourceDeserializer;
 import com.arjuna.ats.jta.recovery.XARecoveryResource;
@@ -78,6 +78,16 @@
 
 public class XARecoveryModule implements ExtendedRecoveryModule
 {
+	private static AtomicBoolean recoveryProblems = new AtomicBoolean(false);
+
+	public static boolean isRecoveryProblems() {
+		return recoveryProblems.get();
+	}
+
+	public static void setRecoveryProblems(final boolean recoveryProblems) {
+		XARecoveryModule.recoveryProblems.set(recoveryProblems);
+	}
+
 	public XARecoveryModule()
 	{
 		this(new com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryResourceManagerImple(),
@@ -92,7 +102,7 @@ public Set<String> getContactedJndiNames() {
 
     @Override
     public boolean isPeriodicWorkSuccessful() {
-        return !RecoveryRequired.isRecoveryProblems();
+        return !XARecoveryModule.isRecoveryProblems();
     }
 
     public void addXAResourceRecoveryHelper(XAResourceRecoveryHelper xaResourceRecoveryHelper) {
@@ -190,7 +200,7 @@ private synchronized void periodicWorkFirstPass(ScanStates endState)
         }
 
         contactedJndiNames.clear();
-		RecoveryRequired.setRecoveryProblems(false);
+		XARecoveryModule.setRecoveryProblems(false);
 
 		_uids = new InputObjectState();
 
@@ -202,18 +212,18 @@ private synchronized void periodicWorkFirstPass(ScanStates endState)
 		{
 			if (!_recoveryStore.allObjUids(_recoveryManagerClass.type(), _uids))
 			{
-				RecoveryRequired.setRecoveryProblems(true);
+				XARecoveryModule.setRecoveryProblems(true);
                 jtaLogger.i18NLogger.warn_recovery_alluids();
 			}
 		}
 		catch (ObjectStoreException e)
 		{
-			RecoveryRequired.setRecoveryProblems(true);
+			XARecoveryModule.setRecoveryProblems(true);
             jtaLogger.i18NLogger.warn_recovery_objstoreerror(e);
 		}
 		catch (Exception e)
 		{
-			RecoveryRequired.setRecoveryProblems(true);
+			XARecoveryModule.setRecoveryProblems(true);
             jtaLogger.i18NLogger.warn_recovery_periodicfirstpass(_logName+".periodicWorkFirstPass", e);
 		}
 		// JBTM-1354 JCA needs to be able to recover XAResources associated with a subordinate transaction so we have to do at least
@@ -229,7 +239,7 @@ private synchronized void periodicWorkFirstPass(ScanStates endState)
 			try {
 				xaRecoveryFirstPass(xaResource);
 			} catch (Exception ex) {
-				RecoveryRequired.setRecoveryProblems(true);
+				XARecoveryModule.setRecoveryProblems(true);
 				jtaLogger.i18NLogger.warn_recovery_getxaresource(ex);
 			}
 		}
@@ -239,7 +249,7 @@ private synchronized void periodicWorkFirstPass(ScanStates endState)
 				try {
 					xaResource.recover(XAResource.TMENDRSCAN);
 				} catch (Exception ex) {
-					RecoveryRequired.setRecoveryProblems(true);
+					XARecoveryModule.setRecoveryProblems(true);
 					jtaLogger.i18NLogger.warn_recovery_getxaresource(ex);
 				}
 			}
@@ -282,7 +292,7 @@ public synchronized void periodicWorkSecondPass()
 		}
 		catch (Exception e)
 		{
-			RecoveryRequired.setRecoveryProblems(true);
+			XARecoveryModule.setRecoveryProblems(true);
             jtaLogger.i18NLogger.warn_recovery_periodicsecondpass(_logName+".periodicWorkSecondPass", e);
 		}
 
@@ -380,7 +390,7 @@ protected XARecoveryModule(XARecoveryResourceManager recoveryClass, String logNa
         _logName = logName;
         _recoveryManagerClass = recoveryClass;
         if(_recoveryManagerClass == null) {
-			RecoveryRequired.setRecoveryProblems(true);
+			XARecoveryModule.setRecoveryProblems(true);
             jtaLogger.i18NLogger.warn_recovery_constfail();
         }
 
@@ -440,7 +450,7 @@ record = _recoveryManagerClass.getResource(theUid);
 									}
 									else
 									{
-										RecoveryRequired.setRecoveryProblems(true);
+										XARecoveryModule.setRecoveryProblems(true);
                                         jtaLogger.i18NLogger.warn_recovery_recoveryfailed(theUid, XARecoveryResourceHelper.stringForm(recoveryStatus));
 									}
 								}
@@ -478,7 +488,7 @@ record = _recoveryManagerClass.getResource(theUid);
 						{
 							problem = true;
 
-							RecoveryRequired.setRecoveryProblems(true);
+							XARecoveryModule.setRecoveryProblems(true);
                             jtaLogger.i18NLogger.warn_recovery_recoveryerror(e);
 						}
 
@@ -495,7 +505,7 @@ record = _recoveryManagerClass.getResource(theUid);
 
 							if (record.getXid() == null)
 							{
-								RecoveryRequired.setRecoveryProblems(true);
+								XARecoveryModule.setRecoveryProblems(true);
                                 jtaLogger.i18NLogger.warn_recovery_cannotadd();
 							}
 							else
@@ -512,7 +522,7 @@ record = _recoveryManagerClass.getResource(theUid);
 			}
 			catch (Throwable e)
 			{
-				RecoveryRequired.setRecoveryProblems(true);
+				XARecoveryModule.setRecoveryProblems(true);
                 jtaLogger.i18NLogger.warn_recovery_unexpectedrecoveryerror(e);
 			}
 		}
@@ -530,7 +540,7 @@ private void bottomUpRecovery() {
 				try {
 					xaRecoverySecondPass(xaResource);
 				} catch (Exception ex) {
-					RecoveryRequired.setRecoveryProblems(true);
+					XARecoveryModule.setRecoveryProblems(true);
 					jtaLogger.i18NLogger.warn_recovery_getxaresource(ex);
 				}
 			}
@@ -595,7 +605,7 @@ private final List<XAResource> resourceInitiatedRecovery()
 				}
 				catch (Exception ex)
 				{
-					RecoveryRequired.setRecoveryProblems(true);
+					XARecoveryModule.setRecoveryProblems(true);
                     jtaLogger.i18NLogger.warn_recovery_getxaresource(ex);
 				}
 			}
@@ -626,7 +636,7 @@ private List<XAResource> resourceInitiatedRecoveryForRecoveryHelpers()
             }
             catch (Exception ex)
             {
-				RecoveryRequired.setRecoveryProblems(true);
+				XARecoveryModule.setRecoveryProblems(true);
                 jtaLogger.i18NLogger.warn_recovery_getxaresource(ex);
             }
         }
@@ -682,7 +692,7 @@ private final void xaRecoveryFirstPass(XAResource xares)
 			}
 			catch (XAException e)
 			{
-				RecoveryRequired.setRecoveryProblems(true);
+				XARecoveryModule.setRecoveryProblems(true);
                 jtaLogger.i18NLogger.warn_recovery_xarecovery1(_logName+".xaRecovery", XAHelper.printXAErrorCode(e), e);
 
 				try
@@ -817,7 +827,7 @@ private void xaRecoverySecondPass(XAResource xares) {
 
 								if (recoveryStatus != XARecoveryResource.RECOVERED_OK)
 								{
-									RecoveryRequired.setRecoveryProblems(true);
+									XARecoveryModule.setRecoveryProblems(true);
 	                                jtaLogger.i18NLogger.warn_recovery_failedtorecover(_logName+".xaRecovery", XARecoveryResourceHelper.stringForm(recoveryStatus));
 								}
 
@@ -832,7 +842,7 @@ private void xaRecoverySecondPass(XAResource xares) {
 								}
 								catch (Exception e)
 								{
-									RecoveryRequired.setRecoveryProblems(true);
+									XARecoveryModule.setRecoveryProblems(true);
 	                                jtaLogger.i18NLogger.warn_recovery_forgetfailed(_logName+".xaRecovery", e);
 								}
 							}
@@ -843,7 +853,7 @@ private void xaRecoverySecondPass(XAResource xares) {
 			}
 			catch (Exception e)
 			{
-				RecoveryRequired.setRecoveryProblems(true);
+				XARecoveryModule.setRecoveryProblems(true);
 	            jtaLogger.i18NLogger.warn_recovery_generalrecoveryerror(_logName + ".xaRecovery", e);
 			}
 
@@ -854,7 +864,7 @@ private void xaRecoverySecondPass(XAResource xares) {
 			}
 			catch (XAException e)
 			{
-				RecoveryRequired.setRecoveryProblems(true);
+				XARecoveryModule.setRecoveryProblems(true);
 	            jtaLogger.i18NLogger.warn_recovery_xarecovery1(_logName+".xaRecovery", XAHelper.printXAErrorCode(e), e);
 			}
 		}
@@ -911,7 +921,7 @@ else if(vote == XAResourceOrphanFilter.Vote.ROLLBACK)
             }
             else
             {
-				RecoveryRequired.setRecoveryProblems(true);
+				XARecoveryModule.setRecoveryProblems(true);
                 jtaLogger.i18NLogger.warn_recovery_xarecovery1(_logName+".xaRecovery", XAHelper.printXAErrorCode(e1), e1);
             }
 
@@ -933,7 +943,7 @@ else if(vote == XAResourceOrphanFilter.Vote.ROLLBACK)
         }
         catch (Exception e2)
         {
-			RecoveryRequired.setRecoveryProblems(true);
+			XARecoveryModule.setRecoveryProblems(true);
             jtaLogger.i18NLogger.warn_recovery_xarecovery2(_logName+".xaRecovery", e2);
         }
         return false;

diff --git a/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/RecoveryRequired.java b/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/RecoveryRequired.java
diff --git a/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaI18NLogger.java b/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaI18NLogger.java
@@ -45,6 +45,9 @@
 /**
  * i18n log messages for the jta module.
  *
+ * For jtaI18NLogger, if any method, prefixed with <b>"warn_recovery"</b> is called then,
+ * <b>XARecoveryModule</b> class variable i.e. "recoveryProblem" should be set as <b>true</b>.
+ *
  * @author Jonathan Halliday (jonathan.halliday@redhat.com) 2010-06
  */
 @MessageLogger(projectCode = "ARJUNA")

diff --git a/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaLogger.java b/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaLogger.java
@@ -37,10 +37,6 @@ public class jtaLogger
 {
     public static final Logger logger = Logger.getLogger("com.arjuna.ats.jta");
 
-    /**
-     * For jtaI18NLogger, if any method, prefixed with <b>"warn_recovery"</b> is called then,
-     * <b>RecoverRequired</b> class variable i.e. "recoveryProblem" should be set as <b>true</b>.
-     * */
     public static final jtaI18NLogger i18NLogger = Logger.getMessageLogger(jtaI18NLogger.class, "com.arjuna.ats.jta");
 
     private jtaI18NLogger jtaI18NLoggerImpl;

diff --git a/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/RecoveryMonitorTest.java b/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/RecoveryMonitorTest.java
@@ -28,7 +28,6 @@
 import com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule;
 import com.arjuna.ats.jta.common.jtaPropertyManager;
 import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionImple;
-import com.arjuna.ats.jta.logging.RecoveryRequired;
 import com.arjuna.ats.jta.logging.jtaLogger;
 import org.junit.Test;
 
@@ -81,7 +80,7 @@ public void testRecoveryMonitorWithFailure() throws Exception {
             // check the output of the scan
             assertEquals("ERROR", RecoveryMonitor.getResponse());
             assertEquals("ERROR", RecoveryMonitor.getSystemOutput());
-            assertTrue(RecoveryRequired.isRecoveryProblems());
+            assertTrue(XARecoveryModule.isRecoveryProblems());
         } finally {
             manager.terminate();
         }

diff --git a/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/RecoveryMonitorTest2.java b/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/RecoveryMonitorTest2.java
@@ -27,7 +27,6 @@
 import com.arjuna.ats.arjuna.tools.RecoveryMonitor;
 import com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule;
 import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionImple;
-import com.arjuna.ats.jta.logging.RecoveryRequired;
 import com.arjuna.ats.jta.logging.jtaLogger;
 import org.junit.Test;
 
@@ -123,7 +122,7 @@ public void start(Xid xid, int i) throws XAException {
             // check the output of the scan
             assertEquals("DONE", RecoveryMonitor.getResponse());
             assertEquals("DONE", RecoveryMonitor.getSystemOutput());
-            assertFalse(RecoveryRequired.isRecoveryProblems());
+            assertFalse(XARecoveryModule.isRecoveryProblems());
         } finally {
             manager.terminate();
         }

diff --git a/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/RecoveryScanTest.java b/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/RecoveryScanTest.java
@@ -28,7 +28,6 @@
 import com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule;
 import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionImple;
 import com.arjuna.ats.jta.common.jtaPropertyManager;
-import com.arjuna.ats.jta.logging.RecoveryRequired;
 import com.arjuna.ats.jta.logging.jtaLogger;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -92,7 +91,7 @@ public void testRecoveryMonitorWithFailure() throws Exception {
 
         manager.scan();
 
-        assertTrue(RecoveryRequired.isRecoveryProblems());
+        assertTrue(XARecoveryModule.isRecoveryProblems());
     }
 
     @Test
@@ -157,7 +156,7 @@ public void start(Xid xid, int i) throws XAException {
 
         manager.scan();
 
-        assertFalse(RecoveryRequired.isRecoveryProblems());
+        assertFalse(XARecoveryModule.isRecoveryProblems());
     }
 
     @Test