Repository: incubator-gearpump Updated Branches: refs/heads/master 05f68bc55 -> 50316ce31
[GEARPUMP-327] Put jarstore and logs under "gearpump.home" Author: manuzhang <[email protected]> Closes #197 from manuzhang/fix_jarstore_logs. Project: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/commit/50316ce3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/tree/50316ce3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/diff/50316ce3 Branch: refs/heads/master Commit: 50316ce31db34785c4af8261dd66d8a1740a5601 Parents: 05f68bc Author: manuzhang <[email protected]> Authored: Fri Jul 21 09:42:59 2017 +0800 Committer: manuzhang <[email protected]> Committed: Fri Jul 21 09:43:10 2017 +0800 ---------------------------------------------------------------------- .gitignore | 4 ---- .../scala/org/apache/gearpump/cluster/worker/Worker.scala | 5 ++++- .../org/apache/gearpump/jarstore/local/LocalJarStore.scala | 9 +++++---- .../src/main/scala/org/apache/gearpump/util/FileUtils.scala | 2 +- core/src/main/scala/org/apache/gearpump/util/LogUtil.scala | 7 ++----- core/src/main/scala/org/apache/gearpump/util/Util.scala | 5 +++++ 6 files changed, 17 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/50316ce3/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 6c0954e..cac7fa6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,3 @@ -# Gearpump -jarstore/ -logs/ - # Scala *.class *.log http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/50316ce3/core/src/main/scala/org/apache/gearpump/cluster/worker/Worker.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/gearpump/cluster/worker/Worker.scala b/core/src/main/scala/org/apache/gearpump/cluster/worker/Worker.scala index 447b034..09821be 100644 --- a/core/src/main/scala/org/apache/gearpump/cluster/worker/Worker.scala +++ b/core/src/main/scala/org/apache/gearpump/cluster/worker/Worker.scala @@ -461,8 +461,11 @@ private[cluster] object Worker { val ipv4 = List(s"-D${PREFER_IPV4}=true") + val gearpumpHome = + List(s"-D${Constants.GEARPUMP_HOME}=${System.getProperty(Constants.GEARPUMP_HOME)}") + val options = ctx.jvmArguments ++ username ++ - logArgs ++ remoteDebugConfig ++ verboseGCConfig ++ ipv4 ++ configArgs + logArgs ++ remoteDebugConfig ++ verboseGCConfig ++ ipv4 ++ gearpumpHome ++ configArgs val process = procLauncher.createProcess(appId, executorId, resource, executorConfig, options, classPath, ctx.mainClass, ctx.arguments) http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/50316ce3/core/src/main/scala/org/apache/gearpump/jarstore/local/LocalJarStore.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/gearpump/jarstore/local/LocalJarStore.scala b/core/src/main/scala/org/apache/gearpump/jarstore/local/LocalJarStore.scala index c15a9be..0a11c03 100644 --- a/core/src/main/scala/org/apache/gearpump/jarstore/local/LocalJarStore.scala +++ b/core/src/main/scala/org/apache/gearpump/jarstore/local/LocalJarStore.scala @@ -21,7 +21,7 @@ import java.io._ import com.typesafe.config.Config import org.apache.gearpump.jarstore.JarStore -import org.apache.gearpump.util.{LogUtil, FileUtils, Constants} +import org.apache.gearpump.util.{Constants, FileUtils, LogUtil, Util} import org.slf4j.Logger /** @@ -29,7 +29,7 @@ import org.slf4j.Logger */ class LocalJarStore extends JarStore { private val LOG: Logger = LogUtil.getLogger(getClass) - private var rootPath: String = null + private var rootPath: File = _ override val scheme: String = "file" class ClosedInputStream extends InputStream { @@ -37,8 +37,9 @@ class LocalJarStore extends JarStore { } override def init(config: Config): Unit = { - rootPath = config.getString(Constants.GEARPUMP_APP_JAR_STORE_ROOT_PATH) - FileUtils.forceMkdir(new File(rootPath)) + rootPath = Util.asSubDirOfGearpumpHome( + config.getString(Constants.GEARPUMP_APP_JAR_STORE_ROOT_PATH)) + FileUtils.forceMkdir(rootPath) } /** http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/50316ce3/core/src/main/scala/org/apache/gearpump/util/FileUtils.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/gearpump/util/FileUtils.scala b/core/src/main/scala/org/apache/gearpump/util/FileUtils.scala index 283a64a..5f5540a 100644 --- a/core/src/main/scala/org/apache/gearpump/util/FileUtils.scala +++ b/core/src/main/scala/org/apache/gearpump/util/FileUtils.scala @@ -48,6 +48,6 @@ object FileUtils { throw new IOException(s"Failed to create directory ${directory.toString}, it already exist") } Files.createParentDirs(directory) - val result = directory.mkdir() + directory.mkdir() } } http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/50316ce3/core/src/main/scala/org/apache/gearpump/util/LogUtil.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/gearpump/util/LogUtil.scala b/core/src/main/scala/org/apache/gearpump/util/LogUtil.scala index 1897ca4..44cb87f 100644 --- a/core/src/main/scala/org/apache/gearpump/util/LogUtil.scala +++ b/core/src/main/scala/org/apache/gearpump/util/LogUtil.scala @@ -93,8 +93,7 @@ object LogUtil { } def daemonLogDir(config: Config): File = { - val dir = config.getString(Constants.GEARPUMP_LOG_DAEMON_DIR) - new File(dir) + Util.asSubDirOfGearpumpHome(config.getString(Constants.GEARPUMP_LOG_DAEMON_DIR)) } def verboseLogToConsole(): Unit = { @@ -114,12 +113,10 @@ object LogUtil { } private def jvmName: String = { - val hostname = Try(InetAddress.getLocalHost.getHostName).getOrElse("local") java.lang.management.ManagementFactory.getRuntimeMXBean().getName() } def applicationLogDir(config: Config): File = { - val appLogDir = config.getString(Constants.GEARPUMP_LOG_APPLICATION_DIR) - new File(appLogDir) + Util.asSubDirOfGearpumpHome(config.getString(Constants.GEARPUMP_LOG_APPLICATION_DIR)) } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/50316ce3/core/src/main/scala/org/apache/gearpump/util/Util.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/gearpump/util/Util.scala b/core/src/main/scala/org/apache/gearpump/util/Util.scala index cc95df1..fe4b540 100644 --- a/core/src/main/scala/org/apache/gearpump/util/Util.scala +++ b/core/src/main/scala/org/apache/gearpump/util/Util.scala @@ -179,4 +179,9 @@ object Util { JvmSetting(executorVMArgs .getOrElse(Array.empty[String]), executorClassPath.getOrElse(Array.empty[String]))) } + + def asSubDirOfGearpumpHome(dir: String): File = { + new File(System.getProperty(Constants.GEARPUMP_HOME), dir) + + } } \ No newline at end of file
