[infinispan-commits] Infinispan SVN: r1368 - trunk/core/src/main/java/org/infinispan/distribution.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-01-13 17:46:20 -0500 (Wed, 13 Jan 2010)
New Revision: 1368

Modified:
   trunk/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java
   trunk/core/src/main/java/org/infinispan/distribution/JoinTask.java
Log:
More logging

Modified: trunk/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java	2010-01-13 22:45:47 UTC (rev 1367)
+++ trunk/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java	2010-01-13 22:46:20 UTC (rev 1368)
@@ -264,10 +264,13 @@
    }
 
    public List<Address> requestPermissionToJoin(Address joiner) {
-      if (JOINER_CAS.compareAndSet(this, null, joiner))
+      if (JOINER_CAS.compareAndSet(this, null, joiner)) {
+         if (trace) log.trace("Allowing {0} to join", joiner);
          return new LinkedList<Address>(consistentHash.getCaches());
-      else
+      } else {
+         if (trace) log.trace("Not allowing {0} to join since there is a join already in progress {1}", joiner, this.joiner);
          return null;
+      }
    }
 
    public void notifyJoinComplete(Address joiner) {

Modified: trunk/core/src/main/java/org/infinispan/distribution/JoinTask.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/distribution/JoinTask.java	2010-01-13 22:45:47 UTC (rev 1367)
+++ trunk/core/src/main/java/org/infinispan/distribution/JoinTask.java	2010-01-13 22:46:20 UTC (rev 1368)
@@ -145,7 +145,7 @@
          }
 
          if (log.isInfoEnabled())
-            log.info("Completed in {0}!", Util.prettyPrintTime(System.currentTimeMillis() - start));
+            log.info("{0} completed join in {1}!", self, Util.prettyPrintTime(System.currentTimeMillis() - start));
       } catch (Exception e) {
          log.error("Caught exception!", e);
          throw new CacheException("Unexpected exception", e);