[infinispan-commits] Infinispan SVN: r891 - in trunk/core/src: main/java/org/infinispan/interceptors and 2 other directories.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-09-29 12:12:12 -0400 (Tue, 29 Sep 2009)
New Revision: 891

Modified:
   trunk/core/src/main/java/org/infinispan/context/impl/LocalTxInvocationContext.java
   trunk/core/src/main/java/org/infinispan/interceptors/DistributionInterceptor.java
   trunk/core/src/main/java/org/infinispan/transaction/xa/GlobalTransactionFactory.java
   trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionTable.java
   trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionXaAdapter.java
   trunk/core/src/test/resources/log4j.xml
Log:
Better logging

Modified: trunk/core/src/main/java/org/infinispan/context/impl/LocalTxInvocationContext.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/context/impl/LocalTxInvocationContext.java	2009-09-29 15:40:22 UTC (rev 890)
+++ trunk/core/src/main/java/org/infinispan/context/impl/LocalTxInvocationContext.java	2009-09-29 16:12:12 UTC (rev 891)
@@ -18,7 +18,7 @@
  */
 public class LocalTxInvocationContext extends AbstractTxInvocationContext {
 
-   private TransactionXaAdapter xaAdapter;
+   private volatile TransactionXaAdapter xaAdapter;
 
    public Transaction getRunningTransaction() {
       return xaAdapter.getTransaction();

Modified: trunk/core/src/main/java/org/infinispan/interceptors/DistributionInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/DistributionInterceptor.java	2009-09-29 15:40:22 UTC (rev 890)
+++ trunk/core/src/main/java/org/infinispan/interceptors/DistributionInterceptor.java	2009-09-29 16:12:12 UTC (rev 891)
@@ -184,7 +184,9 @@
       if (ctx.isOriginLocal()) {
          List<Address> recipients = new ArrayList<Address>(ctx.getTransactionParticipants());
          rpcManager.invokeRemotely(recipients, command, configuration.isSyncCommitPhase(), true);
-         flushL1Cache(recipients.size(), getKeys(ctx.getModifications()), false, null, configuration.isSyncCommitPhase());
+         List<WriteCommand> mods = ctx.getModifications();
+         if (trace) log.trace("CommitCommand is associated with a tx with modifications {0}", mods);
+         flushL1Cache(recipients.size(), getKeys(mods), false, null, configuration.isSyncCommitPhase());
       }
       return invokeNextInterceptor(ctx, command);
    }

Modified: trunk/core/src/main/java/org/infinispan/transaction/xa/GlobalTransactionFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/xa/GlobalTransactionFactory.java	2009-09-29 15:40:22 UTC (rev 890)
+++ trunk/core/src/main/java/org/infinispan/transaction/xa/GlobalTransactionFactory.java	2009-09-29 16:12:12 UTC (rev 891)
@@ -50,12 +50,15 @@
    }
 
    public GlobalTransaction newGlobalTransaction(Address addr, boolean remote) {
+      GlobalTransaction gtx;
       if (isEddEnabled) {
          DeadlockDetectingGlobalTransaction globalTransaction = new DeadlockDetectingGlobalTransaction(addr, remote);
          globalTransaction.setCoinToss(generateRandomdId());
-         return globalTransaction;
+         gtx = globalTransaction;
       } else {
-         return new GlobalTransaction(addr, remote);
+         gtx = new GlobalTransaction(addr, remote);
       }
+
+      return gtx;
    }
 }

Modified: trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionTable.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionTable.java	2009-09-29 15:40:22 UTC (rev 890)
+++ trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionTable.java	2009-09-29 16:12:12 UTC (rev 891)
@@ -94,6 +94,7 @@
       if (current == null) {
          Address localAddress = rpcManager != null ? rpcManager.getTransport().getAddress() : null;
          GlobalTransaction tx = gtf.newGlobalTransaction(localAddress, false);
+         if (trace) log.trace("Created a new GlobalTransaction {0}", tx);
          current = new TransactionXaAdapter(tx, icc, invoker, commandsFactory, configuration, this, transaction);
          localTransactions.put(transaction, current);
          try {

Modified: trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionXaAdapter.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionXaAdapter.java	2009-09-29 15:40:22 UTC (rev 890)
+++ trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionXaAdapter.java	2009-09-29 16:12:12 UTC (rev 891)
@@ -38,7 +38,7 @@
 
    private int txTimeout;
 
-   private List<WriteCommand> modifications;
+   private volatile List<WriteCommand> modifications;
    private BidirectionalMap<Object, CacheEntry> lookedUpEntries;
 
    private GlobalTransaction globalTx;
@@ -64,6 +64,7 @@
    }
 
    public void addModification(WriteCommand mod) {
+      if (trace) log.trace("Adding modification {0}. Mod list is {1}", mod, modifications);
       if (modifications == null) {
          modifications = new ArrayList<WriteCommand>(8);
       }
@@ -201,6 +202,7 @@
    }
 
    public List<WriteCommand> getModifications() {
+      if (trace) log.trace("Retrieving modification list {0}.", modifications);
       return modifications;
    }
 

Modified: trunk/core/src/test/resources/log4j.xml
===================================================================
--- trunk/core/src/test/resources/log4j.xml	2009-09-29 15:40:22 UTC (rev 890)
+++ trunk/core/src/test/resources/log4j.xml	2009-09-29 16:12:12 UTC (rev 891)
@@ -45,7 +45,7 @@
    <!-- ================ -->
 
    <category name="org.infinispan">
-      <priority value="INFO"/>
+      <priority value="TRACE"/>
    </category>
 
    <category name="org.infinispan.profiling">
@@ -66,8 +66,8 @@
 
    <root>
       <priority value="WARN"/>
-      <!--<appender-ref ref="CONSOLE"/>-->
-      <appender-ref ref="FILE"/>
+      <appender-ref ref="CONSOLE"/>
+      <!--<appender-ref ref="FILE"/>-->
    </root>
 
 </log4j:configuration>