svn commit: r1468533 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ server/src/main/java/org/apache/accumulo/server/gc/ src/

[ecn]

Author: ecn
Date: Tue Apr 16 17:58:51 2013
New Revision: 1468533

URL: http://svn.apache.org/r1468533
Log:
ACCUMULO-1281 flush and compact the !METADATA table after a gc cycle

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/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
    accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1468531
  Merged /accumulo/branches/1.5:r1468532
  Merged /accumulo/branches/1.4:r1468531

Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/assemble:r1468531
  Merged /accumulo/branches/1.4/assemble:r1468531
  Merged /accumulo/branches/1.5/assemble:r1468532

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/core:r1468532
  Merged /accumulo/branches/1.4/core:r1468531
  Merged /accumulo/branches/1.4/src/core:r1468531

Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/examples:r1468531
  Merged /accumulo/branches/1.5/examples:r1468532

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:r1468532
  Merged 
/accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1468531
  Merged 
/accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1468531

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

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

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/server:r1468531
  Merged /accumulo/branches/1.5/server:r1468532
  Merged /accumulo/branches/1.4/src/server:r1468531

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=1468533&r1=1468532&r2=1468533&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
 Tue Apr 16 17:58:51 2013
@@ -308,6 +308,15 @@ public class SimpleGarbageCollector impl
       waLogs.stop();
       gcSpan.stop();
       
+      // we just made a lot of changes to the !METADATA table: flush them out
+      try {
+        AuthInfo creds = SecurityConstants.getSystemCredentials();
+        Connector connector = instance.getConnector(creds.getUser(), 
creds.getPassword());
+        connector.tableOperations().compact(Constants.METADATA_TABLE_NAME, 
null, null, true, true);
+      } catch (Exception e) {
+        log.warn(e, e);
+      }
+      
       Trace.offNoFlush();
       try {
         long gcDelay = 
instance.getConfiguration().getTimeInMillis(Property.GC_CYCLE_DELAY);

Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1468531
  Merged /accumulo/branches/1.4/src/src:r1468531
  Merged /accumulo/branches/1.5/src:r1468532