svn commit: r1467003 - in /accumulo/trunk: ./ core/ core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/main/java/org/apache/accumulo/core/conf/ server/ server/src/main/java/org/apache/accumulo/server/gc/

[vines]

Author: vines
Date: Thu Apr 11 17:49:31 2013
New Revision: 1467003

URL: http://svn.apache.org/r1467003
Log:
ACCUMULO-1263 - Shifted gc's no-trash to a property (also fixed javadoc bug)


Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/core/   (props changed)
    
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
    
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.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.5:r1467002

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

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java?rev=1467003&r1=1467002&r2=1467003&view=diff
==============================================================================
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
 Thu Apr 11 17:49:31 2013
@@ -175,7 +175,7 @@ public interface TableOperations {
    *          specifies the maximum number of splits to return
    * @return the split points (end-row names) for the table's current split 
profile, grouped into fewer splits so as not to exceed maxSplits
    * @throws TableNotFoundException
-   * @deprecated since 1.5.0; use {@link #listSplits(String, int))} instead.
+   * @deprecated since 1.5.0; use {@link #listSplits(String, int)} instead.
    */
   @Deprecated
   public Collection<Text> getSplits(String tableName, int maxSplits) throws 
TableNotFoundException;

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java?rev=1467003&r1=1467002&r2=1467003&view=diff
==============================================================================
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java 
(original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java 
Thu Apr 11 17:49:31 2013
@@ -212,6 +212,7 @@ public enum Property {
       + "no longer in use are removed from the filesystem."),
   GC_PORT("gc.port.client", "50091", PropertyType.PORT, "The listening port 
for the garbage collector's monitor service"),
   GC_DELETE_THREADS("gc.threads.delete", "16", PropertyType.COUNT, "The number 
of threads used to delete files"),
+  GC_TRASH_IGNORE("gc.trash.ignore", "false", PropertyType.BOOLEAN, "Do not 
use the Trash, even if it is configured"),
   
   // properties that are specific to the monitor server behavior
   MONITOR_PREFIX("monitor.", null, PropertyType.PREFIX, "Properties in this 
category affect the behavior of the monitor web server."),

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

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=1467003&r1=1467002&r2=1467003&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
 Thu Apr 11 17:49:31 2013
@@ -110,8 +110,6 @@ public class SimpleGarbageCollector impl
     boolean offline = false;
     @Parameter(names={"-a", "--address"}, description="specify our local 
address")
     String address = null;
-    @Parameter(names={"--no-trash"}, description="do not use the Trash, even 
if it is configured")
-    boolean noTrash = false;
   }
 
   // how much of the JVM's available memory should it use gathering candidates
@@ -157,7 +155,7 @@ public class SimpleGarbageCollector impl
     if (opts.address != null)
       gc.useAddress(address);
     
-    gc.init(fs, instance, SecurityConstants.getSystemCredentials(), 
opts.noTrash);
+    gc.init(fs, instance, SecurityConstants.getSystemCredentials(), 
serverConf.getConfiguration().getBoolean(Property.GC_TRASH_IGNORE));
     Accumulo.enableTracing(address, "gc");
     gc.run();
   }