svn commit: r1430998 - in /accumulo/branches/1.4: ./ src/ src/core/ src/server/ src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletStatsKeeper.java

[ecn]

Author: ecn
Date: Wed Jan  9 18:17:09 2013
New Revision: 1430998

URL: http://svn.apache.org/viewvc?rev=1430998&view=rev
Log:
ACCUMULO-641 merge to 1.4 branch

Modified:
    accumulo/branches/1.4/   (props changed)
    accumulo/branches/1.4/src/   (props changed)
    accumulo/branches/1.4/src/core/   (props changed)
    accumulo/branches/1.4/src/server/   (props changed)
    
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletStatsKeeper.java

Propchange: accumulo/branches/1.4/
------------------------------------------------------------------------------
  Merged /accumulo/trunk:r1430997

Propchange: accumulo/branches/1.4/src/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src:r1430997
  Merged /accumulo/trunk:r1430997

Propchange: accumulo/branches/1.4/src/core/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src/core:r1430997
  Merged /accumulo/trunk/core:r1430997

Propchange: accumulo/branches/1.4/src/server/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src/server:r1430997
  Merged /accumulo/trunk/server:r1430997

Modified: 
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletStatsKeeper.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletStatsKeeper.java?rev=1430998&r1=1430997&r2=1430998&view=diff
==============================================================================
--- 
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletStatsKeeper.java
 (original)
+++ 
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletStatsKeeper.java
 Wed Jan  9 18:17:09 2013
@@ -56,7 +56,7 @@ public class TabletStatsKeeper {
         data.count += count;
         data.num++;
         data.elapsed += t;
-        data.queueTime += t;
+        data.queueTime += q;
         data.sumDev += t * t;
         data.queueSumDev += q * q;
         if (data.elapsed < 0 || data.sumDev < 0 || data.queueSumDev < 0 || 
data.queueTime < 0)