accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From md...@apache.org
Subject svn commit: r1500320 - in /accumulo/branches/1.4/src: core/src/main/java/org/apache/accumulo/core/conf/ minicluster/src/main/java/org/apache/accumulo/minicluster/ server/src/main/java/org/apache/accumulo/server/logger/
Date Sat, 06 Jul 2013 20:29:56 GMT
Author: mdrob
Date: Sat Jul  6 20:29:56 2013
New Revision: 1500320

URL: http://svn.apache.org/r1500320
Log:
ACCUMULO-895 Applying Nguessan Kouame's patch, modulo movement of the minicluster source.

Modified:
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
    accumulo/branches/1.4/src/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
    accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/logger/LogService.java

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java?rev=1500320&r1=1500319&r2=1500320&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
(original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
Sat Jul  6 20:29:56 2013
@@ -49,7 +49,7 @@ public enum PropertyType {
   
   PATH("path", ".*",
       "A string that represents a filesystem path, which can be either relative or absolute
to some directory. The filesystem depends on the property."),
-  ABSOLUTEPATH("absolute path", "[/].*",
+  ABSOLUTEPATH("absolute path", "([/]|[A-Z]:[\\\\]).*",
       "An absolute filesystem path. The filesystem depends on the property. This is the same
as path, but enforces that its root is explicitly specified."),
   
   CLASSNAME("java class", "[\\w$.]*", "A fully qualified java class name representing a class
on the classpath.<br />"

Modified: accumulo/branches/1.4/src/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java?rev=1500320&r1=1500319&r2=1500320&view=diff
==============================================================================
--- accumulo/branches/1.4/src/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
(original)
+++ accumulo/branches/1.4/src/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
Sat Jul  6 20:29:56 2013
@@ -134,7 +134,7 @@ public class MiniAccumuloCluster {
     
     ArrayList<String> argList = new ArrayList<String>();
     
-    argList.addAll(Arrays.asList(javaBin, "-cp", classpath, "-Xmx128m", "-XX:+UseConcMarkSweepGC",
"-XX:CMSInitiatingOccupancyFraction=75",
+    argList.addAll(Arrays.asList(javaBin, "-cp", classpath, "-Xmx128m", "-XX:+UseConcMarkSweepGC",
"-XX:CMSInitiatingOccupancyFraction=75", "-Djline.WindowsTerminal.directConsole=false",
         Main.class.getName(), className));
     
     argList.addAll(Arrays.asList(args));
@@ -143,6 +143,7 @@ public class MiniAccumuloCluster {
     
     builder.environment().put("ACCUMULO_HOME", config.getDir().getAbsolutePath());
     builder.environment().put("ACCUMULO_LOG_DIR", logDir.getAbsolutePath());
+
     
     // if we're running under accumulo.start, we forward these env vars
     String env = System.getenv("HADOOP_PREFIX");
@@ -296,7 +297,7 @@ public class MiniAccumuloCluster {
       }
     });
     
-    zooKeeperProcess = exec(Main.class, ZooKeeperServerMain.class.getName(), zooCfgFile.getAbsolutePath());
+    zooKeeperProcess = exec(ZooKeeperServerMain.class, zooCfgFile.getAbsolutePath());
     
     // sleep a little bit to let zookeeper come up before calling init, seems to work better
     UtilWaitThread.sleep(250);

Modified: accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/logger/LogService.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/logger/LogService.java?rev=1500320&r1=1500319&r2=1500320&view=diff
==============================================================================
--- accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/logger/LogService.java
(original)
+++ accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/logger/LogService.java
Sat Jul  6 20:29:56 2013
@@ -157,8 +157,8 @@ public class LogService implements Mutat
     }
     final Set<String> rootDirs = new HashSet<String>();
     for (String root : ServerConfiguration.getSystemConfiguration().get(Property.LOGGER_DIR).split(","))
{
-      if (!root.startsWith("/"))
-        root = System.getenv("ACCUMULO_HOME") + "/" + root;
+      if (!(new File(root).isAbsolute()))
+        root = System.getenv("ACCUMULO_HOME") + File.separator + root;
       else if (root.equals(""))
         root = System.getProperty("org.apache.accumulo.core.dir.log");
       else if (root == null || root.isEmpty()) {



Mime
View raw message