You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/09/23 17:55:53 UTC
[1/3] storm git commit: STORM-2117 Supervisor V2 with local mode
extracts resources directory to the wrong directory
Repository: storm
Updated Branches:
refs/heads/master d2ca97f3e -> d8115e7bd
STORM-2117 Supervisor V2 with local mode extracts resources directory to the wrong directory
* it extracts the resources directory to topology root directory instead of temporary directory
* it should be extracted to temporary directory since we will move that directory to topology root directory
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/26dc3a6a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/26dc3a6a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/26dc3a6a
Branch: refs/heads/master
Commit: 26dc3a6ad333a79224eaac71d5876d0ea1db5853
Parents: 84641f6
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Sep 22 20:46:11 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Sep 22 20:46:11 2016 +0900
----------------------------------------------------------------------
.../src/jvm/org/apache/storm/localizer/AsyncLocalizer.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/26dc3a6a/storm-core/src/jvm/org/apache/storm/localizer/AsyncLocalizer.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/localizer/AsyncLocalizer.java b/storm-core/src/jvm/org/apache/storm/localizer/AsyncLocalizer.java
index 7887281..d3e3925 100644
--- a/storm-core/src/jvm/org/apache/storm/localizer/AsyncLocalizer.java
+++ b/storm-core/src/jvm/org/apache/storm/localizer/AsyncLocalizer.java
@@ -192,12 +192,12 @@ public class AsyncLocalizer implements ILocalizer, Shutdownable {
if (resourcesJar != null) {
LOG.info("Extracting resources from jar at {} to {}", resourcesJar, targetDir);
- Utils.extractDirFromJar(resourcesJar, ConfigUtils.RESOURCES_SUBDIR, _stormRoot);
+ Utils.extractDirFromJar(resourcesJar, ConfigUtils.RESOURCES_SUBDIR, new File(targetDir));
} else if (url != null) {
LOG.info("Copying resources at {} to {} ", url.toString(), targetDir);
if ("jar".equals(url.getProtocol())) {
JarURLConnection urlConnection = (JarURLConnection) url.openConnection();
- Utils.extractDirFromJar(urlConnection.getJarFileURL().getFile(), ConfigUtils.RESOURCES_SUBDIR, _stormRoot);
+ Utils.extractDirFromJar(urlConnection.getJarFileURL().getFile(), ConfigUtils.RESOURCES_SUBDIR, new File(targetDir));
} else {
_fsOps.copyDirectory(new File(url.getFile()), new File(targetDir));
}
[2/3] storm git commit: Merge branch 'STORM-2117' of
https://github.com/HeartSaVioR/storm into STORM-2117
Posted by bo...@apache.org.
Merge branch 'STORM-2117' of https://github.com/HeartSaVioR/storm into STORM-2117
STROM-2117: Supervisor V2 with local mode extracts resources directory to the wrong directory
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7bb3b254
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7bb3b254
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7bb3b254
Branch: refs/heads/master
Commit: 7bb3b25473b7271512715f0599f27c334ef61332
Parents: d2ca97f 26dc3a6
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Sep 23 12:28:03 2016 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Sep 23 12:28:03 2016 -0500
----------------------------------------------------------------------
.../src/jvm/org/apache/storm/localizer/AsyncLocalizer.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[3/3] storm git commit: Added STORM-2117 to Changelog
Posted by bo...@apache.org.
Added STORM-2117 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d8115e7b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d8115e7b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d8115e7b
Branch: refs/heads/master
Commit: d8115e7bdfeb08a9629a6e8525b90de72c35cbf7
Parents: 7bb3b25
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Sep 23 12:28:44 2016 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Sep 23 12:28:44 2016 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/d8115e7b/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b04362c..faaded2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 2.0.0
+ * STORM-2117: Supervisor V2 with local mode extracts resources directory to the wrong directory
* STORM-2110: strip out empty String in worker opts
* STORM-2100: Fix Trident SQL join tests to not rely on ordering
* STORM-2018: Supervisor V2