accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject [3/4] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Date Thu, 09 Jan 2014 21:28:59 GMT
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
	minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java
	minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterGCTest.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/77b45072
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/77b45072
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/77b45072

Branch: refs/heads/master
Commit: 77b45072438b2563c7833dba9b68c08766fea0cd
Parents: 2d51e32 d0f626d
Author: Keith Turner <kturner@apache.org>
Authored: Thu Jan 9 16:32:36 2014 -0500
Committer: Keith Turner <kturner@apache.org>
Committed: Thu Jan 9 16:32:36 2014 -0500

----------------------------------------------------------------------
 .../minicluster/MiniAccumuloCluster.java        |  4 +---
 .../minicluster/MiniAccumuloConfig.java         | 20 ++--------------
 .../minicluster/MiniAccumuloClusterGCTest.java  | 25 --------------------
 .../minicluster/MiniAccumuloClusterTest.java    |  4 ++--
 4 files changed, 5 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/77b45072/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
----------------------------------------------------------------------
diff --cc minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
index 2ed2434,7c618be..09af10b
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
@@@ -414,149 -289,47 +414,147 @@@ public class MiniAccumuloCluster 
     * @throws IllegalStateException
     *           if already started
     */
 -  
    public void start() throws IOException, InterruptedException {
 -    if (zooKeeperProcess != null)
 -      throw new IllegalStateException("Already started");
 -    
 -    Runtime.getRuntime().addShutdownHook(new Thread() {
 -      @Override
 -      public void run() {
 +
 +    if (!initialized) {
 +
 +      Runtime.getRuntime().addShutdownHook(new Thread() {
 +        @Override
 +        public void run() {
 +          try {
 +            MiniAccumuloCluster.this.stop();
 +          } catch (IOException e) {
 +            e.printStackTrace();
 +          } catch (InterruptedException e) {
 +            e.printStackTrace();
 +          }
 +        }
 +      });
 +    }
 +
 +    if (zooKeeperProcess == null) {
 +      zooKeeperProcess = _exec(ZooKeeperServerMain.class, ServerType.ZOOKEEPER, zooCfgFile.getAbsolutePath());
 +    }
 +
 +    if (!initialized) {
 +      // sleep a little bit to let zookeeper come up before calling init, seems to work
better
 +      long startTime = System.currentTimeMillis();
 +      while (true) {
          try {
 -          MiniAccumuloCluster.this.stop();
 -        } catch (IOException e) {
 -          e.printStackTrace();
 -        } catch (InterruptedException e) {
 -          e.printStackTrace();
 +          Socket s = new Socket("localhost", config.getZooKeeperPort());
 +          s.getOutputStream().write("ruok\n".getBytes());
 +          s.getOutputStream().flush();
 +          byte buffer[] = new byte[100];
 +          int n = s.getInputStream().read(buffer);
 +          if (n == 4 && new String(buffer, 0, n).equals("imok"))
 +            break;
 +        } catch (Exception e) {
 +          if (System.currentTimeMillis() - startTime >= 10000) {
 +            throw new RuntimeException("Zookeeper did not start within 10 seconds . Check
the logs in " + config.getLogDir() + " for errors.");
 +          }
 +          UtilWaitThread.sleep(250);
          }
        }
 -    });
 -    
 -    zooKeeperProcess = exec(Main.class, ZooKeeperServerMain.class.getName(), zooCfgFile.getAbsolutePath());
 -    
 -    // sleep a little bit to let zookeeper come up before calling init, seems to work better
 -    UtilWaitThread.sleep(250);
 -    
 -    Process initProcess = exec(Initialize.class, "--instance-name", INSTANCE_NAME, "--password",
config.getRootPassword());
 -    int ret = initProcess.waitFor();
 +      Process initProcess = exec(Initialize.class, "--instance-name", config.getInstanceName(),
"--password", config.getRootPassword());
 +      int ret = initProcess.waitFor();
 +      if (ret != 0) {
 +        throw new RuntimeException("Initialize process returned " + ret + ". Check the logs
in " + config.getLogDir() + " for errors.");
 +      }
 +      initialized = true;
 +    }
 +    synchronized (tabletServerProcesses) {
 +      for (int i = tabletServerProcesses.size(); i < config.getNumTservers(); i++) {
 +        tabletServerProcesses.add(_exec(TabletServer.class, ServerType.TABLET_SERVER));
 +      }
 +    }
 +    int ret = 0;
 +    for (int i = 0; i < 5; i++) {
 +      ret = exec(Main.class, SetGoalState.class.getName(), MasterGoalState.NORMAL.toString()).waitFor();
 +      if (ret == 0)
 +        break;
 +      UtilWaitThread.sleep(1000);
 +    }
      if (ret != 0) {
 -      throw new RuntimeException("Initialize process returned " + ret + ". Check the logs
in " + logDir + " for errors.");
 +      throw new RuntimeException("Could not set master goal state, process returned " +
ret + ". Check the logs in " + config.getLogDir() + " for errors.");
      }
 -    
 -    tabletServerProcesses = new Process[config.getNumTservers()];
 -    for (int i = 0; i < config.getNumTservers(); i++) {
 -      tabletServerProcesses[i] = exec(TabletServer.class);
 +    if (masterProcess == null) {
 +      masterProcess = _exec(Master.class, ServerType.MASTER);
      }
-     if (config.shouldRunGC()) {
-       gcProcess = _exec(SimpleGarbageCollector.class, ServerType.GARBAGE_COLLECTOR);
-     }
 -    
 -    masterProcess = exec(Master.class);
 -    
 -    gcProcess = exec(SimpleGarbageCollector.class);
++    gcProcess = _exec(SimpleGarbageCollector.class, ServerType.GARBAGE_COLLECTOR);
    }
 -  
 +
 +  private List<String> buildRemoteDebugParams(int port) {
 +    return Arrays.asList(new String[] {"-Xdebug", String.format("-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=%d",
port)});
 +  }
 +
 +  /**
 +   * @return generated remote debug ports if in debug mode.
 +   * @since 1.6.0
 +   */
 +  public Set<Pair<ServerType,Integer>> getDebugPorts() {
 +    return debugPorts;
 +  }
 +
 +  List<ProcessReference> references(Process... procs) {
 +    List<ProcessReference> result = new ArrayList<ProcessReference>();
 +    for (Process proc : procs) {
 +      result.add(new ProcessReference(proc));
 +    }
 +    return result;
 +  }
 +
 +  public Map<ServerType,Collection<ProcessReference>> getProcesses() {
 +    Map<ServerType,Collection<ProcessReference>> result = new HashMap<ServerType,Collection<ProcessReference>>();
 +    result.put(ServerType.MASTER, references(masterProcess));
 +    result.put(ServerType.TABLET_SERVER, references(tabletServerProcesses.toArray(new Process[0])));
 +    result.put(ServerType.ZOOKEEPER, references(zooKeeperProcess));
 +    if (null != gcProcess) {
 +      result.put(ServerType.GARBAGE_COLLECTOR, references(gcProcess));
 +    }
 +    return result;
 +  }
 +
 +  public void killProcess(ServerType type, ProcessReference proc) throws ProcessNotFoundException,
InterruptedException {
 +    boolean found = false;
 +    switch (type) {
 +      case MASTER:
 +        if (proc.equals(masterProcess)) {
 +          masterProcess.destroy();
 +          masterProcess = null;
 +          found = true;
 +        }
 +        break;
 +      case TABLET_SERVER:
 +        synchronized (tabletServerProcesses) {
 +          for (Process tserver : tabletServerProcesses) {
 +            if (proc.equals(tserver)) {
 +              tabletServerProcesses.remove(tserver);
 +              tserver.destroy();
 +              found = true;
 +              break;
 +            }
 +          }
 +        }
 +        break;
 +      case ZOOKEEPER:
 +        if (proc.equals(zooKeeperProcess)) {
 +          zooKeeperProcess.destroy();
 +          zooKeeperProcess = null;
 +          found = true;
 +        }
 +        break;
 +      case GARBAGE_COLLECTOR:
 +        if (proc.equals(gcProcess)) {
 +          gcProcess.destroy();
 +          gcProcess = null;
 +          found = true;
 +        }
 +        break;
 +    }
 +    if (!found)
 +      throw new ProcessNotFoundException();
 +  }
 +
    /**
     * @return Accumulo instance name
     */

http://git-wip-us.apache.org/repos/asf/accumulo/blob/77b45072/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java
----------------------------------------------------------------------
diff --cc minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java
index 2326f95,17ab03a..7b410e5
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java
@@@ -30,38 -25,13 +30,37 @@@ import org.apache.accumulo.server.util.
   * 
   * @since 1.5.0
   */
 -
  public class MiniAccumuloConfig {
  
 +  private static final String DEFAULT_INSTANCE_SECRET = "DONTTELL";
 +
    private File dir = null;
    private String rootPassword = null;
 -  private Map<String,String> siteConfig = Collections.emptyMap();
 +  private Map<String,String> siteConfig = new HashMap<String,String>();
    private int numTservers = 2;
 +  private Map<ServerType,Long> memoryConfig = new HashMap<ServerType,Long>();
 +  private boolean jdwpEnabled = false;
 +  private Map<String,String> systemProperties = new HashMap<String,String>();
 +
 +  private String instanceName = "miniInstance";
 +
 +  private File libDir;
 +  private File confDir;
 +  private File zooKeeperDir;
 +  private File accumuloDir;
 +  private File logDir;
 +  private File walogDir;
 +
 +  private Integer zooKeeperPort;
 +  private long defaultMemorySize = 128 * 1024 * 1024;
 +
 +  private boolean initialized = false;
 +
 +  private boolean useMiniDFS = false;
-   private boolean runGC = false;
 +
 +  private String[] classpathItems = null;
 +
 +  private String[] nativePathItems = null;
  
    /**
     * @param dir
@@@ -75,79 -46,16 +74,80 @@@
      this.rootPassword = rootPassword;
    }
  
 -  public File getDir() {
 -    return dir;
 +  /**
 +   * Set directories and fully populate site config
 +   */
 +  MiniAccumuloConfig initialize() {
 +
 +    // Sanity checks
 +    if (this.getDir().exists() && !this.getDir().isDirectory())
 +      throw new IllegalArgumentException("Must pass in directory, " + this.getDir() + "
is a file");
 +
 +    if (this.getDir().exists() && this.getDir().list().length != 0)
 +      throw new IllegalArgumentException("Directory " + this.getDir() + " is not empty");
 +
 +    if (!initialized) {
 +      libDir = new File(dir, "lib");
 +      confDir = new File(dir, "conf");
 +      accumuloDir = new File(dir, "accumulo");
 +      zooKeeperDir = new File(dir, "zookeeper");
 +      logDir = new File(dir, "logs");
 +      walogDir = new File(dir, "walogs");
 +
 +      String[] paths = {"$ACCUMULO_HOME/lib/.*.jar", "$ZOOKEEPER_HOME/zookeeper[^.].*.jar",
"$HADOOP_PREFIX/[^.].*.jar", "$HADOOP_PREFIX/lib/[^.].*.jar",
 +          "$HADOOP_PREFIX/share/hadoop/common/.*.jar", "$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar",
"$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar",
 +          "$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar"};
 +
 +      String classpath = StringUtil.join(Arrays.asList(paths), ",");
 +
 +      mergeProp(Property.INSTANCE_DFS_URI.getKey(), "file:///");
 +      mergeProp(Property.INSTANCE_DFS_DIR.getKey(), accumuloDir.getAbsolutePath());
 +      mergeProp(Property.INSTANCE_SECRET.getKey(), DEFAULT_INSTANCE_SECRET);
 +      mergeProp(Property.TSERV_PORTSEARCH.getKey(), "true");
 +      mergeProp(Property.LOGGER_DIR.getKey(), walogDir.getAbsolutePath());
 +      mergeProp(Property.TSERV_DATACACHE_SIZE.getKey(), "10M");
 +      mergeProp(Property.TSERV_INDEXCACHE_SIZE.getKey(), "10M");
 +      mergeProp(Property.TSERV_MAXMEM.getKey(), "50M");
 +      mergeProp(Property.TSERV_WALOG_MAX_SIZE.getKey(), "100M");
 +      mergeProp(Property.TSERV_NATIVEMAP_ENABLED.getKey(), "false");
 +      mergeProp(Property.TRACE_TOKEN_PROPERTY_PREFIX.getKey() + ".password", getRootPassword());
 +      // since there is a small amount of memory, check more frequently for majc... setting
may not be needed in 1.5
 +      mergeProp(Property.TSERV_MAJC_DELAY.getKey(), "3");
 +      mergeProp(Property.GENERAL_CLASSPATHS.getKey(), classpath);
 +      mergeProp(Property.GENERAL_DYNAMIC_CLASSPATHS.getKey(), libDir.getAbsolutePath() +
"/[^.].*[.]jar");
-       mergeProp(Property.GC_CYCLE_DELAY.getKey(), "30s");
++      mergeProp(Property.GC_CYCLE_DELAY.getKey(), "4s");
++      mergeProp(Property.GC_CYCLE_START.getKey(), "0s");
 +      mergePropWithRandomPort(Property.MASTER_CLIENTPORT.getKey());
 +      mergePropWithRandomPort(Property.TRACE_PORT.getKey());
 +      mergePropWithRandomPort(Property.TSERV_CLIENTPORT.getKey());
 +      mergePropWithRandomPort(Property.MONITOR_PORT.getKey());
 +      mergePropWithRandomPort(Property.GC_PORT.getKey());
 +
 +      // zookeeper port should be set explicitly in this class, not just on the site config
 +      if (zooKeeperPort == null)
 +        zooKeeperPort = PortUtils.getRandomFreePort();
 +      siteConfig.put(Property.INSTANCE_ZK_HOST.getKey(), "localhost:" + zooKeeperPort);
 +      initialized = true;
 +    }
 +    return this;
    }
  
 -  public String getRootPassword() {
 -    return rootPassword;
 +  /**
 +   * Set a given key/value on the site config if it doesn't already exist
 +   */
 +  private void mergeProp(String key, String value) {
 +    if (!siteConfig.containsKey(key)) {
 +      siteConfig.put(key, value);
 +    }
    }
  
 -  public int getNumTservers() {
 -    return numTservers;
 +  /**
 +   * Sets a given key with a random port for the value on the site config if it doesn't
already exist.
 +   */
 +  private void mergePropWithRandomPort(String key) {
 +    if (!siteConfig.containsKey(key)) {
 +      siteConfig.put(key, "0");
 +    }
    }
  
    /**
@@@ -174,284 -77,14 +174,268 @@@
    }
  
    /**
 -   * Calling this method is optional. If not set, it defautls to an empty map.
 +   * Calling this method is optional. If not set, it defaults to an empty map.
     * 
     * @param siteConfig
 -   *          key/values that you normally put in accumulo-site.xml can be put here
 +   *          key/values that you normally put in accumulo-site.xml can be put here.
     */
 -
    public MiniAccumuloConfig setSiteConfig(Map<String,String> siteConfig) {
 -    this.siteConfig = siteConfig;
 +    this.siteConfig = new HashMap<String,String>(siteConfig);
 +    return this;
 +  }
 +
 +  /**
 +   * Calling this method is optional. A random port is generated by default
 +   * 
 +   * @param zooKeeperPort
 +   *          A valid (and unused) port to use for the zookeeper
 +   * 
 +   * @since 1.6.0
 +   */
 +  public MiniAccumuloConfig setZooKeeperPort(int zooKeeperPort) {
 +    this.zooKeeperPort = zooKeeperPort;
 +    return this;
 +  }
 +
 +  /**
 +   * Sets the amount of memory to use in the master process. Calling this method is optional.
Default memory is 128M
 +   * 
 +   * @param serverType
 +   *          the type of server to apply the memory settings
 +   * @param memory
 +   *          amount of memory to set
 +   * 
 +   * @param memoryUnit
 +   *          the units for which to apply with the memory size
 +   * 
 +   * @since 1.6.0
 +   */
 +  public MiniAccumuloConfig setMemory(ServerType serverType, long memory, MemoryUnit memoryUnit)
{
 +    this.memoryConfig.put(serverType, memoryUnit.toBytes(memory));
 +    return this;
 +  }
 +
 +  /**
 +   * Sets the default memory size to use. This value is also used when a ServerType has
not been configured explicitly. Calling this method is optional. Default
 +   * memory is 128M
 +   * 
 +   * @param memory
 +   *          amount of memory to set
 +   * 
 +   * @param memoryUnit
 +   *          the units for which to apply with the memory size
 +   * 
 +   * @since 1.6.0
 +   */
 +  public MiniAccumuloConfig setDefaultMemory(long memory, MemoryUnit memoryUnit) {
 +    this.defaultMemorySize = memoryUnit.toBytes(memory);
 +    return this;
 +  }
 +
 +  /**
 +   * @return a copy of the site config
 +   */
 +  public Map<String,String> getSiteConfig() {
 +    return new HashMap<String,String>(siteConfig);
 +  }
 +
 +  /**
 +   * @return name of configured instance
 +   * 
 +   * @since 1.6.0
 +   */
 +  public String getInstanceName() {
 +    return instanceName;
 +  }
 +
 +  /**
 +   * @return The configured zookeeper port
 +   * 
 +   * @since 1.6.0
 +   */
 +  public int getZooKeeperPort() {
 +    return zooKeeperPort;
 +  }
 +
 +  File getLibDir() {
 +    return libDir;
 +  }
 +
 +  File getConfDir() {
 +    return confDir;
 +  }
 +
 +  File getZooKeeperDir() {
 +    return zooKeeperDir;
 +  }
 +
 +  public File getAccumuloDir() {
 +    return accumuloDir;
 +  }
 +
 +  public File getLogDir() {
 +    return logDir;
 +  }
 +
 +  File getWalogDir() {
 +    return walogDir;
 +  }
 +
 +  /**
 +   * @param serverType
 +   *          get configuration for this server type
 +   * 
 +   * @return memory configured in bytes, returns default if this server type is not configured
 +   * 
 +   * @since 1.6.0
 +   */
 +  public long getMemory(ServerType serverType) {
 +    return memoryConfig.containsKey(serverType) ? memoryConfig.get(serverType) : defaultMemorySize;
 +  }
 +
 +  /**
 +   * @return memory configured in bytes
 +   * 
 +   * @since 1.6.0
 +   */
 +  public long getDefaultMemory() {
 +    return defaultMemorySize;
 +  }
 +
 +  /**
 +   * @return zookeeper connection string
 +   * 
 +   * @since 1.6.0
 +   */
 +  public String getZooKeepers() {
 +    return siteConfig.get(Property.INSTANCE_ZK_HOST.getKey());
 +  }
 +
 +  /**
 +   * @return the base directory of the cluster configuration
 +   */
 +  public File getDir() {
 +    return dir;
 +  }
 +
 +  /**
 +   * @return the root password of this cluster configuration
 +   */
 +  public String getRootPassword() {
 +    return rootPassword;
 +  }
 +
 +  /**
 +   * @return the number of tservers configured for this cluster
 +   */
 +  public int getNumTservers() {
 +    return numTservers;
 +  }
 +
 +  /**
 +   * @return is the current configuration in jdwpEnabled mode?
 +   * 
 +   * @since 1.6.0
 +   */
 +  public boolean isJDWPEnabled() {
 +    return jdwpEnabled;
 +  }
 +
 +  /**
 +   * @param jdwpEnabled
 +   *          should the processes run remote jdwpEnabled servers?
 +   * @return the current instance
 +   * 
 +   * @since 1.6.0
 +   */
 +  public MiniAccumuloConfig setJDWPEnabled(boolean jdwpEnabled) {
 +    this.jdwpEnabled = jdwpEnabled;
      return this;
    }
 +
 +  public boolean useMiniDFS() {
 +    return useMiniDFS;
 +  }
 +
 +  public void useMiniDFS(boolean useMiniDFS) {
 +    this.useMiniDFS = useMiniDFS;
 +  }
 +
 +  /**
 +   * @return location of client conf file containing connection parameters for connecting
to this minicluster
 +   * 
 +   * @since 1.6.0
 +   */
 +  public File getClientConfFile() {
 +    return new File(getConfDir(), "client.conf");
 +  }
 +
 +  /**
-    * Whether or not the Accumulo garbage collector proces will run
-    */
-   public boolean shouldRunGC() {
-     return runGC;
-   }
- 
-   /**
-    * Sets if the Accumulo garbage collector process should run
-    * 
-    * @param shouldRunGC
-    */
-   public void runGC(boolean shouldRunGC) {
-     runGC = shouldRunGC;
-   }
- 
-   /**
 +   * sets system properties set for service processes
 +   * 
 +   * @since 1.6.0
 +   */
 +  public void setSystemProperties(Map<String,String> systemProperties) {
 +    this.systemProperties = new HashMap<String,String>(systemProperties);
 +  }
 +
 +  /**
 +   * @return a copy of the system properties for service processes
 +   * 
 +   * @since 1.6.0
 +   */
 +  public Map<String,String> getSystemProperties() {
 +    return new HashMap<String,String>(systemProperties);
 +  }
 +
 +  /**
 +   * Gets the classpath elements to use when spawning processes.
 +   * 
 +   * @return the classpathItems, if set
 +   * 
 +   * @since 1.6.0
 +   */
 +  public String[] getClasspathItems() {
 +    return classpathItems;
 +  }
 +
 +  /**
 +   * Sets the classpath elements to use when spawning processes.
 +   * 
 +   * @param classpathItems
 +   *          the classpathItems to set
 +   * @since 1.6.0
 +   */
 +  public void setClasspathItems(String... classpathItems) {
 +    this.classpathItems = classpathItems;
 +  }
 +
 +  /**
 +   * @return the paths to use for loading native libraries
 +   * 
 +   * @since 1.6.0
 +   */
 +  public String[] getNativeLibPaths() {
 +    return this.nativePathItems == null ? new String[0] : this.nativePathItems;
 +  }
 +
 +  /**
 +   * Sets the path for processes to use for loading native libraries
 +   * 
 +   * @param nativePathItems
 +   *          the nativePathItems to set
 +   * @since 1.6.0
 +   */
 +  public void setNativeLibPaths(String... nativePathItems) {
 +    this.nativePathItems = nativePathItems;
 +  }
 +
 +  /**
 +   * Sets arbitrary configuration properties.
 +   * 
 +   * @since 1.6.0
 +   */
 +  public void setProperty(Property p, String value) {
 +    this.siteConfig.put(p.getKey(), value);
 +  }
  }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/77b45072/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterGCTest.java
----------------------------------------------------------------------
diff --cc minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterGCTest.java
index 86a8950,318f0af..8a01f99
--- a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterGCTest.java
+++ b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterGCTest.java
@@@ -33,63 -32,35 +33,38 @@@ import org.apache.commons.io.filefilter
  import org.apache.commons.io.filefilter.TrueFileFilter;
  import org.apache.log4j.Level;
  import org.apache.log4j.Logger;
 +import org.junit.AfterClass;
  import org.junit.Assert;
 +import org.junit.BeforeClass;
  import org.junit.Ignore;
 -import org.junit.rules.TemporaryFolder;
 +import org.junit.Test;
  
  import com.google.common.collect.ImmutableMap;
- import com.google.common.io.Files;
  
  /**
   * 
   */
  public class MiniAccumuloClusterGCTest {
 +  private static final Logger log = Logger.getLogger(MiniAccumuloClusterGCTest.class);
    
-   @Test
-   public void testGcConfig() throws Exception {
-     File f = Files.createTempDir();
-     f.deleteOnExit();
-     try {
-       MiniAccumuloConfig macConfig = new MiniAccumuloConfig(f, passwd);
-       macConfig.setNumTservers(1);
-   
-       Assert.assertEquals(false, macConfig.shouldRunGC());
-       
-       // Turn on the garbage collector
-       macConfig.runGC(true);
-   
-       Assert.assertEquals(true, macConfig.shouldRunGC());
-     } finally {
-       if (f.exists()) {
-         f.delete();
-       }
-     }
-   }
- 
 -  private static TemporaryFolder tmpDir = new TemporaryFolder();
 +  private static File testDir = new File(System.getProperty("user.dir") + "/target/" + MiniAccumuloClusterGCTest.class.getName());
    private static MiniAccumuloConfig macConfig;
    private static MiniAccumuloCluster accumulo;
    private static final String passwd = "password";
    
 +  @BeforeClass
    public static void setupMiniCluster() throws Exception {
 -    tmpDir.create();
 +    FileUtils.deleteQuietly(testDir);
 +    testDir.mkdir();
      Logger.getLogger("org.apache.zookeeper").setLevel(Level.ERROR);
 -    
 -    macConfig = new MiniAccumuloConfig(tmpDir.getRoot(), passwd);
 +
 +    macConfig = new MiniAccumuloConfig(testDir, passwd);
      macConfig.setNumTservers(1);
 -    
 -    String gcPort = Integer.toString(PortUtils.getRandomFreePort());
 -    
 +
-     // Turn on the garbage collector
-     macConfig.runGC(true);
- 
      // And tweak the settings to make it run often
 -    Map<String,String> config = ImmutableMap.of(Property.GC_CYCLE_DELAY.getKey(),
"1s", Property.GC_CYCLE_START.getKey(), "0s", Property.GC_PORT.getKey(), gcPort);
 +    Map<String,String> config = ImmutableMap.of(Property.GC_CYCLE_DELAY.getKey(),
"1s", Property.GC_CYCLE_START.getKey(), "0s");
      macConfig.setSiteConfig(config);
 -    
 +
      accumulo = new MiniAccumuloCluster(macConfig);
      accumulo.start();
    }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/77b45072/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java
----------------------------------------------------------------------
diff --cc minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java
index 01b3f54,75ae808..fe6f5ed
--- a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java
+++ b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java
@@@ -193,40 -173,14 +193,40 @@@ public class MiniAccumuloClusterTest 
        Assert.assertFalse(entry.getKey().getRowData().toString().toLowerCase().contains("foo"));
        count++;
      }
 -    
 +
      Assert.assertEquals(2, count);
 -    
 +
      conn.instanceOperations().removeProperty(Property.VFS_CONTEXT_CLASSPATH_PROPERTY.getKey()
+ "cx1");
      conn.tableOperations().delete("table2");
 -    
    }
 -  
 +
 +  @Test(timeout = 10000)
 +  public void testDebugPorts() {
 +
 +    Set<Pair<ServerType,Integer>> debugPorts = accumulo.getDebugPorts();
-     Assert.assertEquals(4, debugPorts.size());
++    Assert.assertEquals(5, debugPorts.size());
 +    for (Pair<ServerType,Integer> debugPort : debugPorts) {
 +      Assert.assertTrue(debugPort.getSecond() > 0);
 +    }
 +  }
 +
 +  @Test(timeout = 10000)
 +  public void testAccurateProcessListReturned() throws Exception {
 +    Map<ServerType,Collection<ProcessReference>> procs = accumulo.getProcesses();
 +
-     Assert.assertFalse(procs.containsKey(ServerType.GARBAGE_COLLECTOR));
++    Assert.assertTrue(procs.containsKey(ServerType.GARBAGE_COLLECTOR));
 +
 +    for (ServerType t : new ServerType[] {ServerType.MASTER, ServerType.TABLET_SERVER, ServerType.ZOOKEEPER})
{
 +      Assert.assertTrue(procs.containsKey(t));
 +      Collection<ProcessReference> procRefs = procs.get(t);
 +      Assert.assertTrue(1 <= procRefs.size());
 +
 +      for (ProcessReference procRef : procRefs) {
 +        Assert.assertNotNull(procRef);
 +      }
 +    }
 +  }
 +
    @AfterClass
    public static void tearDownMiniCluster() throws Exception {
      accumulo.stop();


Mime
View raw message