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 2017/02/03 02:23:43 UTC
[1/3] storm git commit: STORM-2324 : Making sure toplogy deployment
does not break if resources directory is missing in topology jar. UT fixes
Repository: storm
Updated Branches:
refs/heads/master 2d9543c18 -> e8c390059
STORM-2324 : Making sure toplogy deployment does not break if resources directory is missing in topology jar. UT fixes
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ab430f5e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ab430f5e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ab430f5e
Branch: refs/heads/master
Commit: ab430f5efa1b3df26319fef6e85b0944106d7823
Parents: 9947dd1
Author: Roshan Naik <ro...@hortonworks.com>
Authored: Thu Feb 2 16:17:15 2017 -0800
Committer: Roshan Naik <ro...@hortonworks.com>
Committed: Thu Feb 2 16:21:11 2017 -0800
----------------------------------------------------------------------
.../org/apache/storm/daemon/supervisor/Container.java | 13 ++++++++++---
.../apache/storm/daemon/supervisor/ContainerTest.java | 2 +-
2 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ab430f5e/storm-core/src/jvm/org/apache/storm/daemon/supervisor/Container.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/daemon/supervisor/Container.java b/storm-core/src/jvm/org/apache/storm/daemon/supervisor/Container.java
index e370bc4..9f41682 100644
--- a/storm-core/src/jvm/org/apache/storm/daemon/supervisor/Container.java
+++ b/storm-core/src/jvm/org/apache/storm/daemon/supervisor/Container.java
@@ -414,12 +414,19 @@ public abstract class Container implements Killable {
blobFileNames.add(ret);
}
}
+ File targetResourcesDir = new File(stormRoot, ConfigUtils.RESOURCES_SUBDIR);
List<String> resourceFileNames = new ArrayList<>();
- resourceFileNames.add(ConfigUtils.RESOURCES_SUBDIR);
+ if (targetResourcesDir.exists()) {
+ resourceFileNames.add(ConfigUtils.RESOURCES_SUBDIR);
+ }
resourceFileNames.addAll(blobFileNames);
+
LOG.info("Creating symlinks for worker-id: {} storm-id: {} for files({}): {}", _workerId, _topologyId, resourceFileNames.size(), resourceFileNames);
- _ops.createSymlink(new File(workerRoot, ConfigUtils.RESOURCES_SUBDIR),
- new File(stormRoot, ConfigUtils.RESOURCES_SUBDIR));
+ if(targetResourcesDir.exists()) {
+ _ops.createSymlink(new File(workerRoot, ConfigUtils.RESOURCES_SUBDIR), targetResourcesDir );
+ } else {
+ LOG.info("Topology jar for worker-id: {} storm-id: {} does not contain re sources directory {}." , _workerId, _topologyId, targetResourcesDir.toString() );
+ }
for (String fileName : blobFileNames) {
_ops.createSymlink(new File(workerRoot, fileName),
new File(stormRoot, fileName));
http://git-wip-us.apache.org/repos/asf/storm/blob/ab430f5e/storm-core/test/jvm/org/apache/storm/daemon/supervisor/ContainerTest.java
----------------------------------------------------------------------
diff --git a/storm-core/test/jvm/org/apache/storm/daemon/supervisor/ContainerTest.java b/storm-core/test/jvm/org/apache/storm/daemon/supervisor/ContainerTest.java
index b1adcd8..b6806c8 100644
--- a/storm-core/test/jvm/org/apache/storm/daemon/supervisor/ContainerTest.java
+++ b/storm-core/test/jvm/org/apache/storm/daemon/supervisor/ContainerTest.java
@@ -216,7 +216,7 @@ public class ContainerTest {
verify(ops).createSymlink(new File(workerRoot, "artifacts"), workerArtifacts);
//Create links to blobs
- verify(ops).createSymlink(new File(workerRoot, "resources"), new File(distRoot, "resources"));
+ verify(ops, never()).createSymlink(new File(workerRoot, "resources"), new File(distRoot, "resources"));
}
@Test
[2/3] storm git commit: Merge branch 'STORM-2324m' of
https://github.com/roshannaik/storm into STORM-2324-merge
Posted by ka...@apache.org.
Merge branch 'STORM-2324m' of https://github.com/roshannaik/storm into STORM-2324-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/29a68089
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/29a68089
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/29a68089
Branch: refs/heads/master
Commit: 29a68089ab30a242655a7cc89ad1d83f48176609
Parents: 2d9543c ab430f5
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Feb 3 10:54:10 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Feb 3 10:54:10 2017 +0900
----------------------------------------------------------------------
.../org/apache/storm/daemon/supervisor/Container.java | 13 ++++++++++---
.../apache/storm/daemon/supervisor/ContainerTest.java | 2 +-
2 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[3/3] storm git commit: STORM-2324: CHANGELOG
Posted by ka...@apache.org.
STORM-2324: CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e8c39005
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e8c39005
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e8c39005
Branch: refs/heads/master
Commit: e8c390059df5a3199763f33601b00c4a0b7d4ed0
Parents: 29a6808
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Feb 3 11:23:30 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Feb 3 11:23:30 2017 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/e8c39005/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 275e32f..e5a6fba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -196,6 +196,7 @@
* STORM-1769: Added a test to check local nimbus with notifier plugin
## 1.1.0
+ * STORM-2324: Fix deployment failure if resources directory is missing in topology jar
* STORM-1443: [Storm SQL] Support customizing parallelism in StormSQL
* STORM-2148: [Storm SQL] Trident mode: back to code generate and compile Trident topology
* STORM-2321: Handle blobstore zk key deletion in KeySequenceNumber.