accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [33/50] [abbrv] git commit: ACCUMULO-895 Applying Nguessan Kouame's patch, modulo movement of the minicluster source.
Date Wed, 31 Jul 2013 01:59:53 GMT
ACCUMULO-895 Applying Nguessan Kouame's patch, modulo movement of the minicluster source.


git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.4@1500320 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: d5da59ac8c35a846374537b0ef35226c07428fea
Parents: 1725ec3
Author: Mike Drob <mdrob@apache.org>
Authored: Sat Jul 6 20:29:56 2013 +0000
Committer: Mike Drob <mdrob@apache.org>
Committed: Sat Jul 6 20:29:56 2013 +0000

----------------------------------------------------------------------
 .../main/java/org/apache/accumulo/core/conf/PropertyType.java   | 2 +-
 .../org/apache/accumulo/minicluster/MiniAccumuloCluster.java    | 5 +++--
 .../main/java/org/apache/accumulo/server/logger/LogService.java | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d5da59ac/src/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
----------------------------------------------------------------------
diff --git a/src/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java b/src/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
index 67bd6c4..9e64548 100644
--- a/src/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
+++ b/src/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
@@ -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 />"

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d5da59ac/src/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
----------------------------------------------------------------------
diff --git a/src/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
b/src/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
index 2335560..3a4a1fd 100644
--- a/src/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
+++ b/src/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
@@ -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);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d5da59ac/src/server/src/main/java/org/apache/accumulo/server/logger/LogService.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/logger/LogService.java b/src/server/src/main/java/org/apache/accumulo/server/logger/LogService.java
index b83b49b..b386234 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/logger/LogService.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/logger/LogService.java
@@ -157,8 +157,8 @@ public class LogService implements MutationLogger.Iface, Watcher {
     }
     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