svn commit: r1309385 - in /accumulo/trunk: ./ core/ core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java server/ server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java

[ecn]

Author: ecn
Date: Wed Apr  4 13:51:44 2012
New Revision: 1309385

URL: http://svn.apache.org/viewvc?rev=1309385&view=rev
Log:
ACCUMULO-512 merge to trunk

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/core/   (props changed)
    
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
    accumulo/trunk/server/   (props changed)
    
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1306573,1309372
  Merged /accumulo/branches/1.3:r1309369
  Merged /accumulo/branches/1.4:r1306573,1309372-1309373

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/core:r1306573,1309372-1309373
  Merged /accumulo/branches/1.4/src/core:r1306573,1309372

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java?rev=1309385&r1=1309384&r2=1309385&view=diff
==============================================================================
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
 Wed Apr  4 13:51:44 2012
@@ -85,7 +85,7 @@ public class AccumuloOutputFormat extend
   private static final String NUM_WRITE_THREADS = PREFIX + ".writethreads";
   
   private static final long DEFAULT_MAX_MUTATION_BUFFER_SIZE = 50 * 1024 * 
1024; // 50MB
-  private static final int DEFAULT_MAX_LATENCY = 60; // 1 minute
+  private static final int DEFAULT_MAX_LATENCY = 60 * 1000; // 1 minute
   private static final int DEFAULT_NUM_WRITE_THREADS = 2;
   
   /**

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/server:r1306573,1309372-1309373
  Merged /accumulo/branches/1.4/src/server:r1306573,1309372

Modified: 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java?rev=1309385&r1=1309384&r2=1309385&view=diff
==============================================================================
--- 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
 (original)
+++ 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
 Wed Apr  4 13:51:44 2012
@@ -288,7 +288,7 @@ public class SimpleGarbageCollector impl
       waLogs.stop();
       gcSpan.stop();
       
-      Trace.off();
+      Trace.offNoFlush();
       try {
         long gcDelay = 
ServerConfiguration.getSystemConfiguration().getTimeInMillis(Property.GC_CYCLE_DELAY);
         log.debug("Sleeping for " + gcDelay + " milliseconds");