accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1471062 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ZooStore.java fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java pom.xml server/ src/ test/system/auto/simple/gc.py
Date Tue, 23 Apr 2013 17:31:08 GMT
Author: ecn
Date: Tue Apr 23 17:31:08 2013
New Revision: 1471062

URL: http://svn.apache.org/r1471062
Log:
ACCUMULO-1332 ensure the collector is run after the flush

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/assemble/   (props changed)
    accumulo/trunk/core/   (props changed)
    accumulo/trunk/examples/   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java 
 (props changed)
    accumulo/trunk/pom.xml   (props changed)
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/src/   (props changed)
    accumulo/trunk/test/system/auto/simple/gc.py

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5:r1471061

Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/assemble:r1471061

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/core:r1471061

Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/examples:r1471061

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1471061

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1471061

Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/pom.xml:r1471061

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/server:r1471061

Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/src:r1471061

Modified: accumulo/trunk/test/system/auto/simple/gc.py
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/auto/simple/gc.py?rev=1471062&r1=1471061&r2=1471062&view=diff
==============================================================================
--- accumulo/trunk/test/system/auto/simple/gc.py (original)
+++ accumulo/trunk/test/system/auto/simple/gc.py Tue Apr 23 17:31:08 2013
@@ -32,8 +32,8 @@ class GCTest(SunnyDayTest):
 
     settings = SunnyDayTest.settings.copy()
     settings.update({
-        'gc.cycle.start': 5,
-        'gc.cycle.delay': 15,
+        'gc.cycle.start': 1,
+        'gc.cycle.delay': 1,
         'tserver.memory.maps.max':'5K',
         'tserver.compaction.major.delay': 1,
         })
@@ -58,13 +58,12 @@ class GCTest(SunnyDayTest):
             count = update
 
     def runTest(self):
-        self.waitForStop(self.ingester, 60)
-        self.shell(self.masterHost(), 'flush -t test_ingest')
         self.stop_gc(self.masterHost())
+        self.waitForStop(self.ingester, 60)
+        self.shell(self.masterHost(), 'flush -t test_ingest -w')
 
         count = self.waitForFileCountToStabilize()
-        gc = self.runOn(self.masterHost(),
-                        [self.accumulo_sh(), 'gc'])
+        gc = self.runOn(self.masterHost(), [self.accumulo_sh(), 'gc'])
         self.sleep(10)
         collected = self.fileCount()
         self.assert_(count > collected)



Mime
View raw message