[infinispan-commits] Infinispan SVN: r2351 - branches/4.2.x/core/src/main/java/org/infinispan/distribution.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Mon Sep 13 09:45:26 EDT 2010
Author: manik.surtani at jboss.com
Date: 2010-09-13 09:45:25 -0400 (Mon, 13 Sep 2010)
New Revision: 2351
Modified:
branches/4.2.x/core/src/main/java/org/infinispan/distribution/InvertedLeaveTask.java
branches/4.2.x/core/src/main/java/org/infinispan/distribution/JoinTask.java
Log:
Better time logging for rehashing
Modified: branches/4.2.x/core/src/main/java/org/infinispan/distribution/InvertedLeaveTask.java
===================================================================
--- branches/4.2.x/core/src/main/java/org/infinispan/distribution/InvertedLeaveTask.java 2010-09-13 10:49:24 UTC (rev 2350)
+++ branches/4.2.x/core/src/main/java/org/infinispan/distribution/InvertedLeaveTask.java 2010-09-13 13:45:25 UTC (rev 2351)
@@ -43,7 +43,7 @@
public class InvertedLeaveTask extends RehashTask {
private static final Log log = LogFactory.getLog(InvertedLeaveTask.class);
- private static final boolean trace = true;
+ private static final boolean trace = log.isTraceEnabled();
private final List<Address> leavers;
private final Address self;
private final List<Address> leaversHandled;
@@ -67,8 +67,7 @@
}
protected void performRehash() throws Exception {
- long start = System.currentTimeMillis();
- boolean trace = log.isTraceEnabled();
+ long start = trace ? System.currentTimeMillis() : 0;
int replCount = configuration.getNumOwners();
ConsistentHash oldCH = ConsistentHashHelper.createConsistentHash(configuration, dmi.getConsistentHash().getCaches(), leaversHandled);
@@ -107,13 +106,15 @@
if (trace)
log.trace("Rehash not enabled, so not pulling state.");
}
+ } catch (Exception e) {
+ throw new CacheException("Unexpected exception", e);
+ } finally {
+ leavers.removeAll(leaversHandled);
if (trace)
log.info("{0} completed leave rehash in {1}!", self, Util.prettyPrintTime(System.currentTimeMillis()
- start));
- } catch (Exception e) {
- throw new CacheException("Unexpected exception", e);
- } finally {
- leavers.removeAll(leaversHandled);
+ else
+ log.info("{0} completed leave rehash!", self);
}
}
Modified: branches/4.2.x/core/src/main/java/org/infinispan/distribution/JoinTask.java
===================================================================
--- branches/4.2.x/core/src/main/java/org/infinispan/distribution/JoinTask.java 2010-09-13 10:49:24 UTC (rev 2350)
+++ branches/4.2.x/core/src/main/java/org/infinispan/distribution/JoinTask.java 2010-09-13 13:45:25 UTC (rev 2351)
@@ -45,6 +45,7 @@
public class JoinTask extends RehashTask {
private static final Log log = LogFactory.getLog(JoinTask.class);
+ private static final boolean trace = log.isTraceEnabled();
private final Address self;
public JoinTask(RpcManager rpcManager, CommandsFactory commandsFactory, Configuration conf,
@@ -70,8 +71,7 @@
}
protected void performRehash() throws Exception {
- long start = System.currentTimeMillis();
- boolean trace = log.isTraceEnabled();
+ long start = trace ? System.currentTimeMillis() : 0;
if (log.isDebugEnabled()) log.debug("Commencing rehash on node: " + getMyAddress() + ". Before start, dmi.joinComplete = " + dmi.isJoinComplete());
TransactionLogger transactionLogger = dmi.getTransactionLogger();
boolean unlocked = false;
@@ -137,14 +137,16 @@
invalidateInvalidHolders(chOld, chNew);
}
- if (trace)
- 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);
} finally {
if (!unlocked) transactionLogger.unlockAndDisable();
dmi.setJoinComplete(true);
+ if (trace)
+ log.info("{0} completed join rehash in {1}!", self, Util.prettyPrintTime(System.currentTimeMillis() - start));
+ else
+ log.info("{0} completed join rehash!", self);
}
}
More information about the infinispan-commits
mailing list