You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/02/26 02:35:06 UTC
[1/5] storm git commit: STORM-1545
Repository: storm
Updated Branches:
refs/heads/master 2cacef6a5 -> 8b622cee0
STORM-1545
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/dca0e847
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/dca0e847
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/dca0e847
Branch: refs/heads/master
Commit: dca0e8476f5e55e5b8f8f064e9e47cfd8c3e27c5
Parents: 561ceca
Author: Maciek Próchniak <mp...@touk.pl>
Authored: Thu Feb 18 19:16:12 2016 +0100
Committer: Maciek Próchniak <mp...@touk.pl>
Committed: Thu Feb 18 19:22:27 2016 +0100
----------------------------------------------------------------------
.../apache/storm/metric/FileBasedEventLogger.java | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/dca0e847/storm-core/src/jvm/org/apache/storm/metric/FileBasedEventLogger.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/metric/FileBasedEventLogger.java b/storm-core/src/jvm/org/apache/storm/metric/FileBasedEventLogger.java
index a56a596..07e735b 100644
--- a/storm-core/src/jvm/org/apache/storm/metric/FileBasedEventLogger.java
+++ b/storm-core/src/jvm/org/apache/storm/metric/FileBasedEventLogger.java
@@ -18,6 +18,7 @@
package org.apache.storm.metric;
import org.apache.storm.task.TopologyContext;
+import org.apache.storm.utils.ConfigUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -79,25 +80,17 @@ public class FileBasedEventLogger implements IEventLogger {
@Override
public void prepare(Map stormConf, TopologyContext context) {
- String logDir; // storm local directory
+ String workersArtifactRoot = ConfigUtils.workerArtifactsRoot(stormConf);
String stormId = context.getStormId();
int port = context.getThisWorkerPort();
- if ((logDir = System.getProperty("storm.local.dir")) == null &&
- (logDir = (String)stormConf.get("storm.local.dir")) == null) {
- String msg = "Could not determine the directory to log events.";
- LOG.error(msg);
- throw new RuntimeException(msg);
- } else {
- LOG.info("FileBasedEventLogger log directory {}.", logDir);
- }
/*
* Include the topology name & worker port in the file name so that
* multiple event loggers can log independently.
*/
- Path path = Paths.get(logDir, "workers-artifacts", stormId, Integer.toString(port), "events.log");
+ Path path = Paths.get(workersArtifactRoot, stormId, Integer.toString(port), "events.log");
if (!path.isAbsolute()) {
- path = Paths.get(System.getProperty("storm.home"), logDir, "workers-artifacts",
+ path = Paths.get(System.getProperty("storm.home"), workersArtifactRoot,
stormId, Integer.toString(port), "events.log");
}
File dir = path.toFile().getParentFile();
[3/5] storm git commit: no need to handle non-absolut paths in
FileBasedEventLogger config
Posted by ka...@apache.org.
no need to handle non-absolut paths in FileBasedEventLogger config
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6d43f369
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6d43f369
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6d43f369
Branch: refs/heads/master
Commit: 6d43f369a8a16fbf05ca1032e177bb106ad43ca8
Parents: 02ae42e
Author: Maciek Próchniak <mp...@touk.pl>
Authored: Sun Feb 21 20:31:36 2016 +0100
Committer: Maciek Próchniak <mp...@touk.pl>
Committed: Sun Feb 21 20:31:36 2016 +0100
----------------------------------------------------------------------
.../src/jvm/org/apache/storm/metric/FileBasedEventLogger.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/6d43f369/storm-core/src/jvm/org/apache/storm/metric/FileBasedEventLogger.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/metric/FileBasedEventLogger.java b/storm-core/src/jvm/org/apache/storm/metric/FileBasedEventLogger.java
index 1613b37..43833e8 100644
--- a/storm-core/src/jvm/org/apache/storm/metric/FileBasedEventLogger.java
+++ b/storm-core/src/jvm/org/apache/storm/metric/FileBasedEventLogger.java
@@ -83,16 +83,13 @@ public class FileBasedEventLogger implements IEventLogger {
String stormId = context.getStormId();
int port = context.getThisWorkerPort();
- String workersArtifactRoot = ConfigUtils.workerArtifactsRoot(stormConf, stormId, port);
-
/*
* Include the topology name & worker port in the file name so that
* multiple event loggers can log independently.
*/
+ String workersArtifactRoot = ConfigUtils.workerArtifactsRoot(stormConf, stormId, port);
+
Path path = Paths.get(workersArtifactRoot, "events.log");
- if (!path.isAbsolute()) {
- path = Paths.get(System.getProperty("storm.home"), workersArtifactRoot, "events.log");
- }
File dir = path.toFile().getParentFile();
if (!dir.exists()) {
dir.mkdirs();
[2/5] storm git commit: STORM-1545 - more common code
Posted by ka...@apache.org.
STORM-1545 - more common code
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/02ae42eb
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/02ae42eb
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/02ae42eb
Branch: refs/heads/master
Commit: 02ae42ebe8e42da7a567c2a49309dd6ca4aa5155
Parents: dca0e84
Author: Maciek Próchniak <mp...@touk.pl>
Authored: Thu Feb 18 19:32:18 2016 +0100
Committer: Maciek Próchniak <mp...@touk.pl>
Committed: Thu Feb 18 19:32:18 2016 +0100
----------------------------------------------------------------------
.../jvm/org/apache/storm/metric/FileBasedEventLogger.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/02ae42eb/storm-core/src/jvm/org/apache/storm/metric/FileBasedEventLogger.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/metric/FileBasedEventLogger.java b/storm-core/src/jvm/org/apache/storm/metric/FileBasedEventLogger.java
index 07e735b..1613b37 100644
--- a/storm-core/src/jvm/org/apache/storm/metric/FileBasedEventLogger.java
+++ b/storm-core/src/jvm/org/apache/storm/metric/FileBasedEventLogger.java
@@ -80,18 +80,18 @@ public class FileBasedEventLogger implements IEventLogger {
@Override
public void prepare(Map stormConf, TopologyContext context) {
- String workersArtifactRoot = ConfigUtils.workerArtifactsRoot(stormConf);
String stormId = context.getStormId();
int port = context.getThisWorkerPort();
+ String workersArtifactRoot = ConfigUtils.workerArtifactsRoot(stormConf, stormId, port);
+
/*
* Include the topology name & worker port in the file name so that
* multiple event loggers can log independently.
*/
- Path path = Paths.get(workersArtifactRoot, stormId, Integer.toString(port), "events.log");
+ Path path = Paths.get(workersArtifactRoot, "events.log");
if (!path.isAbsolute()) {
- path = Paths.get(System.getProperty("storm.home"), workersArtifactRoot,
- stormId, Integer.toString(port), "events.log");
+ path = Paths.get(System.getProperty("storm.home"), workersArtifactRoot, "events.log");
}
File dir = path.toFile().getParentFile();
if (!dir.exists()) {
[5/5] storm git commit: add STORM-1545 to CHANGELOG.md
Posted by ka...@apache.org.
add STORM-1545 to CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8b622cee
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8b622cee
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8b622cee
Branch: refs/heads/master
Commit: 8b622cee0754f0cf6c108af06caf03651760db8f
Parents: 0fc5843
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Feb 25 17:34:54 2016 -0800
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Feb 25 17:34:54 2016 -0800
----------------------------------------------------------------------
CHANGELOG.md | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/8b622cee/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0416db6..5b85f35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 2.0.0
+ * STORM-1545: Topology Debug Event Log in Wrong Location
* STORM-1254: port ui.helper to java
* STORM-1571: Improvment Kafka Spout Time Metric
* STORM-1569: Allowing users to specify the nimbus thrift server queue size.
@@ -38,6 +39,7 @@
* STORM-1521: When using Kerberos login from keytab with multiple bolts/executors ticket is not renewed in hbase bolt.
## 1.0.0
+ * STORM-1552: Fix topology event sampling log dir
* STORM-1542: Remove profile action retry in case of non-zero exit code
* STORM-1540: Fix Debug/Sampling for Trident
* STORM-1522: REST API throws invalid worker log links
[4/5] storm git commit: Merge branch 'STORM-1545' of
https://github.com/mproch/storm into STORM-1545
Posted by ka...@apache.org.
Merge branch 'STORM-1545' of https://github.com/mproch/storm into STORM-1545
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0fc58437
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0fc58437
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0fc58437
Branch: refs/heads/master
Commit: 0fc58437badb0f6b464141889d532dea87ff4457
Parents: 2cacef6 6d43f36
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Feb 25 17:16:43 2016 -0800
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Feb 25 17:16:43 2016 -0800
----------------------------------------------------------------------
.../apache/storm/metric/FileBasedEventLogger.java | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
----------------------------------------------------------------------