You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2015/06/10 02:59:55 UTC
[01/28] storm git commit: STORM-813 notify mvn exec:java cannot run
multilang topology
Repository: storm
Updated Branches:
refs/heads/0.10.x-branch 64f46ebc5 -> 7bca912e8
STORM-813 notify mvn exec:java cannot run multilang topology
* New multilang packages rely on supervisor deploy or maven dependency plugin
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a448be54
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a448be54
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a448be54
Branch: refs/heads/0.10.x-branch
Commit: a448be54543783225671eb7578b872c75645fe3e
Parents: 847958c
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon May 11 23:21:23 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon May 11 23:21:23 2015 +0900
----------------------------------------------------------------------
examples/storm-starter/README.markdown | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/a448be54/examples/storm-starter/README.markdown
----------------------------------------------------------------------
diff --git a/examples/storm-starter/README.markdown b/examples/storm-starter/README.markdown
index 1cb6636..f6c97ba 100644
--- a/examples/storm-starter/README.markdown
+++ b/examples/storm-starter/README.markdown
@@ -76,10 +76,10 @@ of Storm in this local Maven repository at `$HOME/.m2/repository`.
> Note: All following examples require that you run `cd examples/storm-starter` beforehand.
-storm-starter topologies can be run with the maven-exec-plugin. For example, to
-compile and run `WordCountTopology` in local mode, use the command:
+storm-starter topologies which don't use multilang feature can be run with the maven-exec-plugin.
+For example, to compile and run `ExclamationTopology` in local mode, use the command:
- $ mvn compile exec:java -Dstorm.topology=storm.starter.WordCountTopology
+ $ mvn compile exec:java -Dstorm.topology=storm.starter.ExclamationTopology
You can also run clojure topologies with Maven:
@@ -111,6 +111,8 @@ You can submit (run) a topology contained in this uberjar to Storm via the `stor
# under the name "production-topology"
$ storm jar storm-starter-*.jar storm.starter.RollingTopWords production-topology remote
+With submitting you can run topologies which use multilang, for example, `WordCountTopology`.
+
_Submitting a topology in local vs. remote mode:_
It depends on the actual code of a topology how you can or even must tell Storm whether to run the topology locally (in
an in-memory LocalCluster instance of Storm) or remotely (in a "real" Storm cluster). In the case of
[03/28] storm git commit: Migrate from logback to log4j2
Posted by pt...@apache.org.
Migrate from logback to log4j2
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/32e11b96
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/32e11b96
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/32e11b96
Branch: refs/heads/0.10.x-branch
Commit: 32e11b962b2ea39ffe1f3c199989a223e9d8ffeb
Parents: 28558b3
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Tue Jun 2 21:51:10 2015 +0000
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Wed Jun 3 14:52:49 2015 +0000
----------------------------------------------------------------------
bin/storm.py | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/32e11b96/bin/storm.py
----------------------------------------------------------------------
diff --git a/bin/storm.py b/bin/storm.py
index 1f371b2..ba89304 100755
--- a/bin/storm.py
+++ b/bin/storm.py
@@ -177,13 +177,15 @@ def parse_args(string):
args = [re.compile(r"'((?:[^'\\]|\\.)*)'").sub('\\1', x) for x in args]
return [re.compile(r'\\(.)').sub('\\1', x) for x in args]
-def exec_storm_class(klass, jvmtype="-server", jvmopts=[], extrajars=[], args=[], fork=False, daemon=True):
+def exec_storm_class(klass, jvmtype="-server", jvmopts=[], extrajars=[], args=[], fork=False, daemon=True, daemonName=""):
global CONFFILE
storm_log_dir = confvalue("storm.log.dir",[CLUSTER_CONF_DIR])
if(storm_log_dir == None or storm_log_dir == "nil"):
storm_log_dir = os.path.join(STORM_DIR, "logs")
all_args = [
- "java", jvmtype, get_config_opts(),
+ JAVA_CMD, jvmtype,
+ "-Ddaemon.name=" + daemonName,
+ get_config_opts(),
"-Dstorm.home=" + STORM_DIR,
"-Dstorm.log.dir=" + storm_log_dir,
"-Djava.library.path=" + confvalue("java.library.path", extrajars, daemon),
@@ -345,12 +347,12 @@ def nimbus(klass="backtype.storm.daemon.nimbus"):
cppaths = [CLUSTER_CONF_DIR]
jvmopts = parse_args(confvalue("nimbus.childopts", cppaths)) + [
"-Dlogfile.name=nimbus.log",
- "-Ddaemon.name=nimbus",
"-Dlog4j.configurationFile=" + os.path.join(get_log4j_conf_dir(), "cluster.xml"),
]
exec_storm_class(
klass,
jvmtype="-server",
+ daemonName="nimbus",
extrajars=cppaths,
jvmopts=jvmopts)
@@ -366,12 +368,12 @@ def supervisor(klass="backtype.storm.daemon.supervisor"):
cppaths = [CLUSTER_CONF_DIR]
jvmopts = parse_args(confvalue("supervisor.childopts", cppaths)) + [
"-Dlogfile.name=supervisor.log",
- "-Ddaemon.name=supervisor",
"-Dlog4j.configurationFile=" + os.path.join(get_log4j_conf_dir(), "cluster.xml"),
]
exec_storm_class(
klass,
jvmtype="-server",
+ daemonName="supervisor",
extrajars=cppaths,
jvmopts=jvmopts)
@@ -388,12 +390,12 @@ def ui():
cppaths = [CLUSTER_CONF_DIR]
jvmopts = parse_args(confvalue("ui.childopts", cppaths)) + [
"-Dlogfile.name=ui.log",
- "-Ddaemon.name=ui",
"-Dlog4j.configurationFile=" + os.path.join(get_log4j_conf_dir(), "cluster.xml")
]
exec_storm_class(
"backtype.storm.ui.core",
jvmtype="-server",
+ daemonName="ui",
jvmopts=jvmopts,
extrajars=[STORM_DIR, CLUSTER_CONF_DIR])
@@ -410,12 +412,12 @@ def logviewer():
cppaths = [CLUSTER_CONF_DIR]
jvmopts = parse_args(confvalue("logviewer.childopts", cppaths)) + [
"-Dlogfile.name=logviewer.log",
- "-Ddaemon.name=logviewer",
"-Dlog4j.configurationFile=" + os.path.join(get_log4j_conf_dir(), "cluster.xml")
]
exec_storm_class(
"backtype.storm.daemon.logviewer",
jvmtype="-server",
+ daemonName="logviewer",
jvmopts=jvmopts,
extrajars=[STORM_DIR, CLUSTER_CONF_DIR])
@@ -431,12 +433,12 @@ def drpc():
cppaths = [CLUSTER_CONF_DIR]
jvmopts = parse_args(confvalue("drpc.childopts", cppaths)) + [
"-Dlogfile.name=drpc.log",
- "-Ddaemon.name=drpc",
"-Dlog4j.configurationFile=" + os.path.join(get_log4j_conf_dir(), "cluster.xml")
]
exec_storm_class(
"backtype.storm.daemon.drpc",
jvmtype="-server",
+ daemonName="drpc",
jvmopts=jvmopts,
extrajars=[CLUSTER_CONF_DIR])
[23/28] storm git commit: Merge branch 'STORM-813' of
github.com:HeartSaVioR/storm
Posted by pt...@apache.org.
Merge branch 'STORM-813' of github.com:HeartSaVioR/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/80616df4
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/80616df4
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/80616df4
Branch: refs/heads/0.10.x-branch
Commit: 80616df4e6df21c49976bd570780924e5f770da1
Parents: 1baaeb0 a448be5
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Jun 9 14:25:46 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Jun 9 14:25:46 2015 -0400
----------------------------------------------------------------------
examples/storm-starter/README.markdown | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[25/28] storm git commit: Merge branch 'master' of
github.com:rmkellogg/storm
Posted by pt...@apache.org.
Merge branch 'master' of github.com:rmkellogg/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5a6c7699
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5a6c7699
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5a6c7699
Branch: refs/heads/0.10.x-branch
Commit: 5a6c7699b329ba0aa797c0c422e682b74e7b0282
Parents: 9c1ea17 f35871c
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Jun 9 14:30:04 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Jun 9 14:30:04 2015 -0400
----------------------------------------------------------------------
.../security/serialization/BlowfishTupleSerializer.java | 5 +++--
storm-core/src/jvm/backtype/storm/utils/ShellProcess.java | 8 ++++----
2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[13/28] storm git commit: STORM-852 - Replaced Apache Log4j Logger
with SLF4J API.
Posted by pt...@apache.org.
STORM-852 - Replaced Apache Log4j Logger with SLF4J API.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f35871cf
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f35871cf
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f35871cf
Branch: refs/heads/0.10.x-branch
Commit: f35871cf481d273b9de979a2034aa96458334b32
Parents: 4a523ad
Author: Rick Kellogg <rm...@comcast.net>
Authored: Fri Jun 5 11:39:26 2015 -0400
Committer: Rick Kellogg <rm...@comcast.net>
Committed: Fri Jun 5 11:39:26 2015 -0400
----------------------------------------------------------------------
.../security/serialization/BlowfishTupleSerializer.java | 5 +++--
storm-core/src/jvm/backtype/storm/utils/ShellProcess.java | 8 ++++----
2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f35871cf/storm-core/src/jvm/backtype/storm/security/serialization/BlowfishTupleSerializer.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/security/serialization/BlowfishTupleSerializer.java b/storm-core/src/jvm/backtype/storm/security/serialization/BlowfishTupleSerializer.java
index ae90f33..8e66cdf 100644
--- a/storm-core/src/jvm/backtype/storm/security/serialization/BlowfishTupleSerializer.java
+++ b/storm-core/src/jvm/backtype/storm/security/serialization/BlowfishTupleSerializer.java
@@ -19,7 +19,8 @@ package backtype.storm.security.serialization;
import java.util.Map;
import org.apache.commons.codec.binary.Hex;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
@@ -43,7 +44,7 @@ public class BlowfishTupleSerializer extends Serializer<ListDelegate> {
* You should use in via "storm -c topology.tuple.serializer.blowfish.key=YOURKEY -c topology.tuple.serializer=backtype.storm.security.serialization.BlowfishTupleSerializer jar ...".
*/
public static String SECRET_KEY = "topology.tuple.serializer.blowfish.key";
- private static final Logger LOG = Logger.getLogger(BlowfishTupleSerializer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BlowfishTupleSerializer.class);
private BlowfishSerializer _serializer;
public BlowfishTupleSerializer(Kryo kryo, Map storm_conf) {
http://git-wip-us.apache.org/repos/asf/storm/blob/f35871cf/storm-core/src/jvm/backtype/storm/utils/ShellProcess.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/ShellProcess.java b/storm-core/src/jvm/backtype/storm/utils/ShellProcess.java
index 811d5b9..82eabf1 100644
--- a/storm-core/src/jvm/backtype/storm/utils/ShellProcess.java
+++ b/storm-core/src/jvm/backtype/storm/utils/ShellProcess.java
@@ -31,11 +31,11 @@ import java.io.Serializable;
import java.util.List;
import java.util.Map;
-import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ShellProcess implements Serializable {
- public static Logger LOG = Logger.getLogger(ShellProcess.class);
+ public static Logger LOG = LoggerFactory.getLogger(ShellProcess.class);
public static Logger ShellLogger;
private Process _subprocess;
private InputStream processErrorStream;
@@ -52,7 +52,7 @@ public class ShellProcess implements Serializable {
ProcessBuilder builder = new ProcessBuilder(command);
builder.directory(new File(context.getCodeDir()));
- ShellLogger = Logger.getLogger(context.getThisComponentId());
+ ShellLogger = LoggerFactory.getLogger(context.getThisComponentId());
this.componentName = context.getThisComponentId();
this.serializer = getSerializer(conf);
[04/28] storm git commit: Merge branch 'log4j-changes' of
https://github.com/kishorvpatil/incubator-storm into STORM-833
Posted by pt...@apache.org.
Merge branch 'log4j-changes' of https://github.com/kishorvpatil/incubator-storm into STORM-833
STORM-833: Logging framework logback -> log4j 2.x
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6aeef56a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6aeef56a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6aeef56a
Branch: refs/heads/0.10.x-branch
Commit: 6aeef56a4684d57e457392c5130db6ab277cbd42
Parents: 2154048 32e11b9
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Jun 4 13:01:54 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Jun 4 13:01:54 2015 -0500
----------------------------------------------------------------------
bin/storm-config.cmd | 4 +-
bin/storm.py | 33 +++++---
conf/log4j2.xml | 32 ++++++++
conf/logback.xml | 28 -------
log4j2/cluster.xml | 76 +++++++++++++++++
log4j2/worker.xml | 77 ++++++++++++++++++
logback/cluster.xml | 85 --------------------
logback/worker.xml | 41 ----------
pom.xml | 25 ++++--
storm-core/pom.xml | 12 ++-
.../src/clj/backtype/storm/daemon/logviewer.clj | 11 +--
.../src/clj/backtype/storm/daemon/nimbus.clj | 5 +-
.../clj/backtype/storm/daemon/supervisor.clj | 14 +++-
.../src/clj/backtype/storm/daemon/worker.clj | 2 +-
storm-core/src/clj/backtype/storm/util.clj | 9 ++-
storm-core/src/jvm/backtype/storm/Config.java | 11 +++
.../src/jvm/backtype/storm/LogWriter.java | 83 +++++++++++++++++++
.../test/clj/backtype/storm/logviewer_test.clj | 8 +-
.../test/clj/backtype/storm/supervisor_test.clj | 30 ++++++-
storm-dist/binary/src/main/assembly/binary.xml | 8 +-
20 files changed, 398 insertions(+), 196 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/6aeef56a/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/6aeef56a/storm-core/src/clj/backtype/storm/daemon/worker.clj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/6aeef56a/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/6aeef56a/storm-dist/binary/src/main/assembly/binary.xml
----------------------------------------------------------------------
[10/28] storm git commit: STORM-850 Convert storm-core's
logback-test.xml to log4j2-test.xml
Posted by pt...@apache.org.
STORM-850 Convert storm-core's logback-test.xml to log4j2-test.xml
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4ca39f15
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4ca39f15
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4ca39f15
Branch: refs/heads/0.10.x-branch
Commit: 4ca39f15eea4ca8c3853f82cf00574babd47c963
Parents: bf2ef23
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Jun 5 13:08:11 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Jun 5 13:08:11 2015 +0900
----------------------------------------------------------------------
storm-core/test/resources/log4j2-test.xml | 32 +++++++++++++++++++++++++
storm-core/test/resources/logback-test.xml | 26 --------------------
2 files changed, 32 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/4ca39f15/storm-core/test/resources/log4j2-test.xml
----------------------------------------------------------------------
diff --git a/storm-core/test/resources/log4j2-test.xml b/storm-core/test/resources/log4j2-test.xml
new file mode 100644
index 0000000..4b12147
--- /dev/null
+++ b/storm-core/test/resources/log4j2-test.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<configuration monitorInterval="60">
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%-4r [%t] %-5p %c{1.} - %msg%n"/>
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Logger name="org.apache.zookeeper" level="WARN"/>
+ <Root level="${env:LOG_LEVEL:-INFO}">
+ <AppenderRef ref="Console"/>
+ </Root>
+ </Loggers>
+</configuration>
+
http://git-wip-us.apache.org/repos/asf/storm/blob/4ca39f15/storm-core/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/storm-core/test/resources/logback-test.xml b/storm-core/test/resources/logback-test.xml
deleted file mode 100644
index 346b8ca..0000000
--- a/storm-core/test/resources/logback-test.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration scan="true" scanPeriod="30 seconds">
- <appender name="A1" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%-4r [%t] %-5p %c - %m%n</pattern>
- </encoder>
- </appender>
- <logger name="org.apache.zookeeper" level="WARN"/>
- <root level="${LOG_LEVEL:-INFO}">
- <appender-ref ref="A1"/>
- </root>
-</configuration>
\ No newline at end of file
[05/28] storm git commit: Added STORM-833 to Changelog
Posted by pt...@apache.org.
Added STORM-833 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/19e3a28e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/19e3a28e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/19e3a28e
Branch: refs/heads/0.10.x-branch
Commit: 19e3a28e18dae692c8e3afca41fcb75582e1fa66
Parents: 6aeef56
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Jun 4 13:08:37 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Jun 4 13:08:37 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/19e3a28e/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa390f1..83ae5a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
## 0.11.0
## 0.10.0
+ * STORM-833: Logging framework logback -> log4j 2.x
* STORM-842: Drop Support for Java 1.6
* STORM-835: Netty Client hold batch object until io operation complete
* STORM-827: Allow AutoTGT to work with storm-hdfs too.
[18/28] storm git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/storm
Posted by pt...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c1ffb2e1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c1ffb2e1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c1ffb2e1
Branch: refs/heads/0.10.x-branch
Commit: c1ffb2e1e1ec6a8abb5118892ba5aed083222d8b
Parents: 7e43a2b 9579c0b
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Jun 5 13:37:14 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Jun 5 13:37:14 2015 -0400
----------------------------------------------------------------------
CHANGELOG.md | 3 +
external/flux/flux-core/pom.xml | 4 +
external/storm-hdfs/pom.xml | 4 +
external/storm-jdbc/pom.xml | 4 +
external/storm-kafka/pom.xml | 8 +
pom.xml | 18 +-
storm-core/pom.xml | 226 +++++++++++++++++++-
storm-core/test/resources/log4j2-test.xml | 32 +++
storm-core/test/resources/logback-test.xml | 26 ---
storm-dist/binary/src/main/assembly/binary.xml | 44 ++++
10 files changed, 321 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
[16/28] storm git commit: Merge branch 'STORM-850' of
https://github.com/HeartSaVioR/storm into STORM-850
Posted by pt...@apache.org.
Merge branch 'STORM-850' of https://github.com/HeartSaVioR/storm into STORM-850
STORM-850: Convert storm-core's logback-test.xml to log4j2-test.xml
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b63cfd8d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b63cfd8d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b63cfd8d
Branch: refs/heads/0.10.x-branch
Commit: b63cfd8d54ad89e1deb61059beee3e1a638dea27
Parents: 2f93835 4ca39f1
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Jun 5 12:13:29 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Jun 5 12:13:29 2015 -0500
----------------------------------------------------------------------
storm-core/test/resources/log4j2-test.xml | 32 +++++++++++++++++++++++++
storm-core/test/resources/logback-test.xml | 26 --------------------
2 files changed, 32 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
[09/28] storm git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/storm
Posted by pt...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7e43a2b1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7e43a2b1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7e43a2b1
Branch: refs/heads/0.10.x-branch
Commit: 7e43a2b16f373a25df1e0e86e5a01266ebc69085
Parents: 70ce03c bf2ef23
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Jun 4 16:03:43 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 4 16:03:43 2015 -0400
----------------------------------------------------------------------
CHANGELOG.md | 1 +
storm-core/src/clj/backtype/storm/config.clj | 2 +-
.../src/clj/backtype/storm/daemon/nimbus.clj | 10 ++++----
.../src/jvm/backtype/storm/utils/Utils.java | 26 ++++++++++++++++++++
4 files changed, 33 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[12/28] storm git commit: Added STORM-849 to Changelog
Posted by pt...@apache.org.
Added STORM-849 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4a523ad8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4a523ad8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4a523ad8
Branch: refs/heads/0.10.x-branch
Commit: 4a523ad8f1ca50e8ba7b176453e727060bda7e09
Parents: 4b083f3
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Jun 5 08:53:59 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Jun 5 08:53:59 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/4a523ad8/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 549eee3..e85bfd5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
## 0.11.0
## 0.10.0
+ * STORM-849: Add storm-redis to storm binary distribution
* STORM-760: Use JSON for serialized conf
* STORM-833: Logging framework logback -> log4j 2.x
* STORM-842: Drop Support for Java 1.6
[24/28] storm git commit: add STORM-813 to readme
Posted by pt...@apache.org.
add STORM-813 to readme
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9c1ea176
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9c1ea176
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9c1ea176
Branch: refs/heads/0.10.x-branch
Commit: 9c1ea176f5bcf2eb53543e9a645e8fb6bb10bbbb
Parents: 80616df
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Jun 9 14:26:56 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Jun 9 14:26:56 2015 -0400
----------------------------------------------------------------------
CHANGELOG.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/9c1ea176/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81224c6..1ea26dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,8 @@
## 0.11.0
## 0.10.0
- * STORM-853 Fix upload API to handle multi-args properly
+ * STORM-813: Change storm-starter's README so that it explains mvn exec:java cannot run multilang topology
+ * STORM-853: Fix upload API to handle multi-args properly
* STORM-850: Convert storm-core's logback-test.xml to log4j2-test.xml
* STORM-848: Shade external dependencies
* STORM-849: Add storm-redis to storm binary distribution
[27/28] storm git commit: fix NOTICE/LICENSE files
Posted by pt...@apache.org.
fix NOTICE/LICENSE files
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/27bc183c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/27bc183c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/27bc183c
Branch: refs/heads/0.10.x-branch
Commit: 27bc183c0f1e33fefb19b640f8a91f563c60ce61
Parents: 531e9c0
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Jun 9 15:06:48 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Jun 9 15:06:48 2015 -0400
----------------------------------------------------------------------
NOTICE | 4 +-
storm-dist/binary/LICENSE | 224 ++++++++++++++++++++++++++++++-----------
storm-dist/binary/NOTICE | 4 +-
3 files changed, 172 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/27bc183c/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 637e578..39041e4 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,8 +1,8 @@
Apache Storm
-Copyright 2014 The Apache Software Foundation
+Copyright 2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
This product includes software developed by Yahoo! Inc. (www.yahoo.com)
-Copyright (c) 2012-2014 Yahoo! Inc.
\ No newline at end of file
+Copyright (c) 2012-2015 Yahoo! Inc.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/storm/blob/27bc183c/storm-dist/binary/LICENSE
----------------------------------------------------------------------
diff --git a/storm-dist/binary/LICENSE b/storm-dist/binary/LICENSE
index 1a8c4a8..b52a6b5 100644
--- a/storm-dist/binary/LICENSE
+++ b/storm-dist/binary/LICENSE
@@ -203,22 +203,6 @@
-----------------------------------------------------------------------
-logback License
-
-Logback: the reliable, generic, fast and flexible logging framework.
-Copyright (C) 1999-2012, QOS.ch. All rights reserved.
-
-This program and the accompanying materials are dual-licensed under
-either the terms of the Eclipse Public License v1.0 as published by
-the Eclipse Foundation
-
- or (per the licensee's choosing)
-
-under the terms of the GNU Lesser General Public License version 2.1
-as published by the Free Software Foundation.
-
------------------------------------------------------------------------
-
slf4j License
Copyright (c) 2004-2013 QOS.ch
@@ -245,14 +229,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-----------------------------------------------------------------------
-For jQuery 1.6.2 (storm-core/src/ui/public/js/jquery-1.6.2.min.js)
-
-jQuery JavaScript Library v1.6.2
-http://jquery.com/
-
-Copyright 2011, John Resig
-Dual licensed under the MIT or GPL Version 2 licenses.
-http://jquery.org/license
+For jQuery 1.11.1 (storm-core/src/ui/public/js/jquery-1.11.1.min.js)
Includes Sizzle.js
http://sizzlejs.com/
@@ -261,6 +238,8 @@ Released under the MIT, BSD, and GPL Licenses.
MIT license selected:
+Copyright 2014 jQuery Foundation and other contributors
+http://jquery.com/
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
@@ -268,10 +247,8 @@ without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
-
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -307,35 +284,16 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-----------------------------------------------------------------------
-For jQuery TableSorter 2.0.5b (storm-core/src/ui/public/js/jquery.tablesorter.min.js)
-
-Copyright (c) 2007 Christian Bach
-Examples and docs at: http://tablesorter.com
-Dual licensed under the MIT and GPL licenses:
-http://www.opensource.org/licenses/mit-license.php
-http://www.gnu.org/licenses/gpl.html
-
-MIT license selected:
-
-Copyright (c) 2007 Christian Bach
+Copyright (c) 2008-2010, Allan Jardine
+All rights reserved.
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ * Neither the name of Allan Jardine nor SpryMedia UK may be used to endorse or promote products derived from this software without specific prior written permission.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-----------------------------------------------------------------------
@@ -424,6 +382,61 @@ For Arbor Tween (storm-core/src/ui/public/js/arbor-tween.js)
-----------------------------------------------------------------------
+For mustache.js (storm-core/src/ui/public/js/jquery.mustache.js)
+
+The MIT License
+
+Copyright (c) 2009 Chris Wanstrath (Ruby)
+Copyright (c) 2010-2014 Jan Lehnardt (JavaScript)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+-----------------------------------------------------------------------
+
+For moment.js (storm-core/src/ui/public/js/moment.min.js)
+
+Copyright (c) 2011-2014 Tim Wood, Iskren Chernev, Moment.js contributors
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+
+-----------------------------------------------------------------------
+
For Jquery url plugin (storm-core/src/ui/public/js/url.min.js)
Jquery Url (A Jquery plugin for URL parser) v1.8.6
@@ -432,12 +445,41 @@ Licensed under an MIT-style license. Seehttps://github.com/websanova/js-url#lice
-----------------------------------------------------------------------
-For mustache.js (storm-core/src/ui/public/js/jquery.mustache.js)
-The MIT License
+For jquery.blockUI.min.js (storm-core/src/ui/public/js/jquery.blockUI.min.js)
-Copyright (c) 2009 Chris Wanstrath (Ruby)
-Copyright (c) 2010-2014 Jan Lehnardt (JavaScript)
+jQuery BlockUI; v20131009
+http://jquery.malsup.com/block/
+Copyright (c) 2013 M. Alsup; Dual licensed: MIT/GPL
+
+Copyright © 2007-2013 M. Alsup.
+
+MIT license selected:
+
+The BlockUI plugin is dual licensed under the MIT and GPL licenses.
+
+You may use either license. The MIT license is recommended for most projects
+because it is simple and easy to understand and it places almost no
+restrictions on what you can do with the plugin.
+
+If the GPL suits your project better you are also free to use the plugin
+under that license.
+
+You do not have to do anything special to choose one license or the other and
+you don't have to notify anyone which license you are using. You are free to
+use the BlockUI plugin in commercial projects as long as the copyright header is left intact.
+
+-----------------------------------------------------------------------
+
+For jquery dataTables v1.10.4
+
+(storm-core/src/ui/public/js/jquery.dataTables.1.10.4.min.js
+storm-core/src/ui/public/css/jquery.dataTables.1.10.4.min.css
+storm-core/src/ui/public/images/{{back, forward}_{disabled, enabled, enabled_hover}}.png
+storm-core/src/ui/public/images/{sort_{asc, asc_disabled, both, desc, desc_disabled}}.png)
+
+Copyright (c) 2008-2013 SpryMedia Limited
+http://datatables.net
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -456,3 +498,73 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
+
+-----------------------------------------------------------------------
+
+For jquery dataTables bootstrap integration
+
+(storm-core/src/ui/public/js/jquery.dataTables.1.10.4.min.js
+torm-core/src/ui/public/css/dataTables.bootstrap.css)
+
+Copyright (c) 2013-2014 SpryMedia Limited
+http://datatables.net/license
+https://github.com/DataTables/Plugins/tree/master/integration/bootstrap/3
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+-----------------------------------------------------------------------
+
+For bootstrap v3.3.1
+(storm-core/src/ui/public/js/bootstrap-3.3.1.min.js
+storm-core/src/ui/public/css/bootstrap-3.3.1.min.css)
+
+Bootstrap v3.3.1 (http://getbootstrap.com)
+Copyright 2011-2014 Twitter, Inc.
+Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+
+-----------------------------------------------------------------------
+
+For jQuery JSONFormatter 1.0.1 2015-02-28
+(storm-core/src/ui/public/js/jsonFormatter.min.js
+storm-core/src/ui/public/css/jsonFormatter.min.css)
+http://www.jqueryscript.net/other/jQuery-Plugin-For-Pretty-JSON-Formatting-jsonFormatter.htmlA
+
+The MIT License (MIT)
+
+Copyright (c) 2015 Matthew Heironimus
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
http://git-wip-us.apache.org/repos/asf/storm/blob/27bc183c/storm-dist/binary/NOTICE
----------------------------------------------------------------------
diff --git a/storm-dist/binary/NOTICE b/storm-dist/binary/NOTICE
index a3e2fff..d862fab 100644
--- a/storm-dist/binary/NOTICE
+++ b/storm-dist/binary/NOTICE
@@ -1,11 +1,11 @@
Apache Storm
-Copyright 2014 The Apache Software Foundation
+Copyright 2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
This product includes software developed by Yahoo! Inc. (www.yahoo.com)
-Copyright (c) 2012-2014 Yahoo! Inc.
+Copyright (c) 2012-2015 Yahoo! Inc.
YAML support provided by snakeyaml (http://code.google.com/p/snakeyaml/).
Copyright (c) 2008-2010 Andrey Somov
[21/28] storm git commit: Merge branch 'STORM-853' of
github.com:HeartSaVioR/storm
Posted by pt...@apache.org.
Merge branch 'STORM-853' of github.com:HeartSaVioR/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/97e3fac7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/97e3fac7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/97e3fac7
Branch: refs/heads/0.10.x-branch
Commit: 97e3fac75925044cf43709b2d2c305c604fde2f5
Parents: c1ffb2e fb5fe34
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Jun 9 14:19:54 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Jun 9 14:19:54 2015 -0400
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/ui/core.clj | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[06/28] storm git commit: Merge branch 'STORM-760' of
https://github.com/revans2/incubator-storm into STORM-760
Posted by pt...@apache.org.
Merge branch 'STORM-760' of https://github.com/revans2/incubator-storm into STORM-760
STORM-760: Use JSON for serialized conf
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/07f5e676
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/07f5e676
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/07f5e676
Branch: refs/heads/0.10.x-branch
Commit: 07f5e6769ea35f8d680f937b3358176000ae8bdc
Parents: 19e3a28 5f55c51
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Jun 4 13:51:40 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Jun 4 13:51:40 2015 -0500
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/config.clj | 2 +-
.../src/clj/backtype/storm/daemon/nimbus.clj | 10 ++++----
.../src/jvm/backtype/storm/utils/Utils.java | 26 ++++++++++++++++++++
3 files changed, 32 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/07f5e676/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
----------------------------------------------------------------------
[15/28] storm git commit: Added STORM-848 to changelog
Posted by pt...@apache.org.
Added STORM-848 to changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2f938354
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2f938354
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2f938354
Branch: refs/heads/0.10.x-branch
Commit: 2f9383547b82873c77175cf94a14f8a133f59556
Parents: 992603a
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Jun 5 11:03:52 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Jun 5 11:03:52 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/2f938354/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e85bfd5..ecc3bf6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
## 0.11.0
## 0.10.0
+ * STORM-848: Shade external dependencies
* STORM-849: Add storm-redis to storm binary distribution
* STORM-760: Use JSON for serialized conf
* STORM-833: Logging framework logback -> log4j 2.x
[26/28] storm git commit: add STORM-852 to changelog
Posted by pt...@apache.org.
add STORM-852 to changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/531e9c08
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/531e9c08
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/531e9c08
Branch: refs/heads/0.10.x-branch
Commit: 531e9c08e544acdafc5e82ab21c8d524a8af6136
Parents: 5a6c769
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Jun 9 14:31:18 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Jun 9 14:31:18 2015 -0400
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/531e9c08/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ea26dc..99e8a61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
## 0.11.0
## 0.10.0
+ * STORM-852: Replaced Apache Log4j Logger with SLF4J API
* STORM-813: Change storm-starter's README so that it explains mvn exec:java cannot run multilang topology
* STORM-853: Fix upload API to handle multi-args properly
* STORM-850: Convert storm-core's logback-test.xml to log4j2-test.xml
[14/28] storm git commit: Merge branch 'STORM-848' of
https://github.com/kishorvpatil/incubator-storm into STORM-848
Posted by pt...@apache.org.
Merge branch 'STORM-848' of https://github.com/kishorvpatil/incubator-storm into STORM-848
STORM-848: Shade external dependencies
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/992603a6
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/992603a6
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/992603a6
Branch: refs/heads/0.10.x-branch
Commit: 992603a651dc4c55f91ebec5cd1aecc2ec09de60
Parents: 4a523ad 6168ae4
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Jun 5 11:03:22 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Jun 5 11:03:22 2015 -0500
----------------------------------------------------------------------
external/flux/flux-core/pom.xml | 4 +
external/storm-hdfs/pom.xml | 4 +
external/storm-jdbc/pom.xml | 4 +
external/storm-kafka/pom.xml | 8 +
pom.xml | 18 +-
storm-core/pom.xml | 226 +++++++++++++++++++-
storm-dist/binary/src/main/assembly/binary.xml | 30 +++
7 files changed, 272 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/992603a6/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/992603a6/storm-core/pom.xml
----------------------------------------------------------------------
diff --cc storm-core/pom.xml
index 18992f2,c43c6b2..096643e
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@@ -198,18 -199,11 +199,19 @@@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/storm/blob/992603a6/storm-dist/binary/src/main/assembly/binary.xml
----------------------------------------------------------------------
[28/28] storm git commit: Merge branch 'master' into 0.10.x-branch
Posted by pt...@apache.org.
Merge branch 'master' into 0.10.x-branch
Conflicts:
CHANGELOG.md
bin/storm-config.cmd
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7bca912e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7bca912e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7bca912e
Branch: refs/heads/0.10.x-branch
Commit: 7bca912e8fbb9ae607ef85af6fcce67ee1dd3046
Parents: 64f46eb 27bc183
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Jun 9 20:59:13 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Jun 9 20:59:13 2015 -0400
----------------------------------------------------------------------
CHANGELOG.md | 3 +
NOTICE | 4 +-
docs/_posts/2015-06-04-storm095-released.md | 23 ++
docs/downloads.html | 59 +++--
examples/storm-starter/README.markdown | 8 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 12 +-
.../serialization/BlowfishTupleSerializer.java | 5 +-
.../jvm/backtype/storm/utils/ShellProcess.java | 8 +-
storm-dist/binary/LICENSE | 224 ++++++++++++++-----
storm-dist/binary/NOTICE | 4 +-
10 files changed, 258 insertions(+), 92 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7bca912e/CHANGELOG.md
----------------------------------------------------------------------
diff --cc CHANGELOG.md
index 5318a8b,99e8a61..6245f5f
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -1,4 -1,9 +1,7 @@@
-## 0.11.0
-
## 0.10.0
+ * STORM-852: Replaced Apache Log4j Logger with SLF4J API
+ * STORM-813: Change storm-starter's README so that it explains mvn exec:java cannot run multilang topology
+ * STORM-853: Fix upload API to handle multi-args properly
* STORM-850: Convert storm-core's logback-test.xml to log4j2-test.xml
* STORM-848: Shade external dependencies
* STORM-849: Add storm-redis to storm binary distribution
[11/28] storm git commit: Merge branch
'add-storm-redis-to-storm-dist' of https://github.com/HeartSaVioR/storm into
STORM-849
Posted by pt...@apache.org.
Merge branch 'add-storm-redis-to-storm-dist' of https://github.com/HeartSaVioR/storm into STORM-849
STORM-849: Add storm-redis to storm binary distribution
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4b083f31
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4b083f31
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4b083f31
Branch: refs/heads/0.10.x-branch
Commit: 4b083f314c3e9f905407536fcd090739f25e7e4d
Parents: bf2ef23 b01a8c9
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Jun 5 08:53:29 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Jun 5 08:53:29 2015 -0500
----------------------------------------------------------------------
storm-dist/binary/src/main/assembly/binary.xml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/4b083f31/storm-dist/binary/src/main/assembly/binary.xml
----------------------------------------------------------------------
[20/28] storm git commit: STORM-853 Handles no topologyMainClassArgs
presented
Posted by pt...@apache.org.
STORM-853 Handles no topologyMainClassArgs presented
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fb5fe34f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fb5fe34f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fb5fe34f
Branch: refs/heads/0.10.x-branch
Commit: fb5fe34f55fdc7e6299d2de406ae9dd28760a10d
Parents: edd9bab
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Jun 6 13:55:29 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Jun 6 13:55:29 2015 +0900
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/ui/core.clj | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/fb5fe34f/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/ui/core.clj b/storm-core/src/clj/backtype/storm/ui/core.clj
index 7fcdb47..eee90f1 100644
--- a/storm-core/src/clj/backtype/storm/ui/core.clj
+++ b/storm-core/src/clj/backtype/storm/ui/core.clj
@@ -525,8 +525,9 @@
storm-cmd (str storm-home file-path-separator "bin" file-path-separator "storm")
tplg-cmd-response (apply sh
(flatten
- [storm-cmd "jar" tplg-jar-file tplg-main-class tplg-main-class-args
- (if (not= user "unknown") (str "-c storm.doAsUser=" user) "")]))]
+ [storm-cmd "jar" tplg-jar-file tplg-main-class
+ (if (not-nil? tplg-main-class-args) tplg-main-class-args [])
+ (if (not= user "unknown") (str "-c storm.doAsUser=" user) [])]))]
(log-message "tplg-cmd-response " tplg-cmd-response)
(cond
(= (tplg-cmd-response :exit) 0) {"status" "success"}
[07/28] storm git commit: Aded STORM-760 to Changelog
Posted by pt...@apache.org.
Aded STORM-760 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/bf2ef232
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/bf2ef232
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/bf2ef232
Branch: refs/heads/0.10.x-branch
Commit: bf2ef232f4b2cd58a3a91801ac6d291a60d2cd38
Parents: 07f5e67
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Jun 4 13:51:55 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Jun 4 13:51:55 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/bf2ef232/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83ae5a8..549eee3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
## 0.11.0
## 0.10.0
+ * STORM-760: Use JSON for serialized conf
* STORM-833: Logging framework logback -> log4j 2.x
* STORM-842: Drop Support for Java 1.6
* STORM-835: Netty Client hold batch object until io operation complete
[08/28] storm git commit: update download page and add blog post for
0.9.5 release
Posted by pt...@apache.org.
update download page and add blog post for 0.9.5 release
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/70ce03cb
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/70ce03cb
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/70ce03cb
Branch: refs/heads/0.10.x-branch
Commit: 70ce03cb58574584babdf5c0cd43100a044e84d2
Parents: 19e3a28
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Jun 4 16:03:18 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 4 16:03:18 2015 -0400
----------------------------------------------------------------------
docs/_posts/2015-06-04-storm095-released.md | 23 +++++++++
docs/downloads.html | 59 +++++++++++++++++-------
2 files changed, 65 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/70ce03cb/docs/_posts/2015-06-04-storm095-released.md
----------------------------------------------------------------------
diff --git a/docs/_posts/2015-06-04-storm095-released.md b/docs/_posts/2015-06-04-storm095-released.md
new file mode 100644
index 0000000..1d018c0
--- /dev/null
+++ b/docs/_posts/2015-06-04-storm095-released.md
@@ -0,0 +1,23 @@
+---
+layout: post
+title: Storm 0.9.5 released
+author: P. Taylor Goetz
+---
+
+The Apache Storm community is pleased to announce that version 0.9.5 has been released and is available from [the downloads page](/downloads.html).
+
+This is a maintenance release that includes a number of important bug fixes that improve Storm's stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
+
+
+Thanks
+------
+Special thanks are due to all those who have contributed to Apache Storm -- whether through direct code contributions, documentation, bug reports, or helping other users on the mailing lists. Your efforts are much appreciated.
+
+
+Full Changelog
+---------
+
+ * STORM-790: Log "task is null" instead of letting worker die when task is null in transfer-fn
+ * STORM-796: Add support for "error" command in ShellSpout
+ * STORM-745: fix storm.cmd to evaluate 'shift' correctly with 'storm jar'
+ * STORM-130: Supervisor getting killed due to java.io.FileNotFoundException: File '../stormconf.ser' does not exist.
http://git-wip-us.apache.org/repos/asf/storm/blob/70ce03cb/docs/downloads.html
----------------------------------------------------------------------
diff --git a/docs/downloads.html b/docs/downloads.html
index bb80b20..e9f7d07 100644
--- a/docs/downloads.html
+++ b/docs/downloads.html
@@ -27,11 +27,51 @@ older:
Current source code is hosted on GitHub, <a href="https://github.com/apache/storm">apache/storm</a>
<h3>Current Release</h3>
- The current release is 0.9.4. Source and binary distributions can be found below.
+ The current release is 0.9.5. Source and binary distributions can be found below.
- The list of changes for this release can be found <a href="https://github.com/apache/storm/blob/v0.9.4/CHANGELOG.md">here.</a>
+ The list of changes for this release can be found <a href="https://github.com/apache/storm/blob/v0.9.5/CHANGELOG.md">here.</a>
<ul>
+ <li><a href="http://www.apache.org/dyn/closer.cgi/storm/apache-storm-0.9.5/apache-storm-0.9.5.tar.gz">apache-storm-0.9.5.tar.gz</a>
+ [<a href="http://www.us.apache.org/dist/storm/apache-storm-0.9.5/apache-storm-0.9.5.tar.gz.asc">PGP</a>]
+ [<a href="http://www.us.apache.org/dist/storm/apache-storm-0.9.5/apache-storm-0.9.5.tar.gz.sha">SHA512</a>]
+ [<a href="http://www.us.apache.org/dist/storm/apache-storm-0.9.5/apache-storm-0.9.5.tar.gz.md5">MD5</a>]
+ </li>
+ <li><a href="http://www.apache.org/dyn/closer.cgi/storm/apache-storm-0.9.5/apache-storm-0.9.5.zip">apache-storm-0.9.5.zip</a>
+ [<a href="http://www.us.apache.org/dist/storm/apache-storm-0.9.5/apache-storm-0.9.5.zip.asc">PGP</a>]
+ [<a href="http://www.us.apache.org/dist/storm/apache-storm-0.9.5/apache-storm-0.9.5.zip.sha">SHA512</a>]
+ [<a href="http://www.us.apache.org/dist/storm/apache-storm-0.9.5/apache-storm-0.9.5.zip.md5">MD5</a>]
+ </li>
+ <li><a href="http://www.apache.org/dyn/closer.cgi/storm/apache-storm-0.9.5/apache-storm-0.9.5-src.tar.gz">apache-storm-0.9.5-src.tar.gz</a>
+ [<a href="http://www.us.apache.org/dist/storm/apache-storm-0.9.5/apache-storm-0.9.5-src.tar.gz.asc">PGP</a>]
+ [<a href="http://www.us.apache.org/dist/storm/apache-storm-0.9.5/apache-storm-0.9.5-src.tar.gz.sha">SHA512</a>]
+ [<a href="http://www.us.apache.org/dist/storm/apache-storm-0.9.5/apache-storm-0.9.5-src.tar.gz.md5">MD5</a>]
+ </li>
+ <li><a href="http://www.apache.org/dyn/closer.cgi/storm/apache-storm-0.9.5/apache-storm-0.9.5-src.zip">apache-storm-0.9.5-src.zip</a>
+ [<a href="http://www.us.apache.org/dist/storm/apache-storm-0.9.5/apache-storm-0.9.5-src.zip.asc">PGP</a>]
+ [<a href="http://www.us.apache.org/dist/storm/apache-storm-0.9.5/apache-storm-0.9.5-src.zip.sha">SHA512</a>]
+ [<a href="http://www.us.apache.org/dist/storm/apache-storm-0.9.5/apache-storm-0.9.5-src.zip.md5">MD5</a>]
+ </li>
+ </ul>
+
+ Storm artifacts are hosted in <a href="http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.storm%22">Maven Central</a>. You can add Storm as a dependency with the following coordinates:
+ <pre>
+groupId: <a href="http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.storm%22">org.apache.storm</a>
+artifactId: storm-core
+version: 0.9.5
+ </pre>
+
+
+ The signing keys for releases can be found <a href="http://www.apache.org/dist/storm/KEYS">here.</a>
+
+ <p>
+
+ </p>
+ <h3>Previous Releases</h3>
+
+ <b>0.9.4</b>
+
+ <ul>
<li><a href="http://www.apache.org/dyn/closer.cgi/storm/apache-storm-0.9.4/apache-storm-0.9.4.tar.gz">apache-storm-0.9.4.tar.gz</a>
[<a href="http://www.us.apache.org/dist/storm/apache-storm-0.9.4/apache-storm-0.9.4.tar.gz.asc">PGP</a>]
[<a href="http://www.us.apache.org/dist/storm/apache-storm-0.9.4/apache-storm-0.9.4.tar.gz.sha">SHA512</a>]
@@ -53,21 +93,6 @@ older:
[<a href="http://www.us.apache.org/dist/storm/apache-storm-0.9.4/apache-storm-0.9.4-src.zip.md5">MD5</a>]
</li>
</ul>
-
- Storm artifacts are hosted in <a href="http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.storm%22">Maven Central</a>. You can add Storm as a dependency with the following coordinates:
- <pre>
-groupId: <a href="http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.storm%22">org.apache.storm</a>
-artifactId: storm-core
-version: 0.9.4
- </pre>
-
-
- The signing keys for releases can be found <a href="http://www.apache.org/dist/storm/KEYS">here.</a>
-
- <p>
-
- </p>
- <h3>Previous Releases</h3>
<b>0.9.3</b>
[02/28] storm git commit: Revert "Merge branch 'STORM-469' of
https://github.com/rekhajoshm/storm into STORM-469"
Posted by pt...@apache.org.
Revert "Merge branch 'STORM-469' of https://github.com/rekhajoshm/storm into STORM-469"
This reverts commit 9b56bc8064dda3c9eab8358dddfed5e60d614a03, reversing
changes made to 27a36066bd1ed21a6fed4b8b0fc71a543740e5b3.
Migrate from logback to log4j2
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/28558b34
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/28558b34
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/28558b34
Branch: refs/heads/0.10.x-branch
Commit: 28558b34c8be84a1288f290675fb34a71ed6203f
Parents: d66444c
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Fri May 15 14:30:34 2015 -0500
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Wed Jun 3 14:50:44 2015 +0000
----------------------------------------------------------------------
bin/storm-config.cmd | 4 +-
bin/storm.py | 27 ++++---
conf/log4j2.xml | 32 ++++++++
conf/logback.xml | 28 -------
log4j2/cluster.xml | 76 +++++++++++++++++
log4j2/worker.xml | 77 ++++++++++++++++++
logback/cluster.xml | 85 --------------------
logback/worker.xml | 41 ----------
pom.xml | 25 ++++--
storm-core/pom.xml | 12 ++-
.../src/clj/backtype/storm/daemon/logviewer.clj | 11 +--
.../src/clj/backtype/storm/daemon/nimbus.clj | 5 +-
.../clj/backtype/storm/daemon/supervisor.clj | 14 +++-
.../src/clj/backtype/storm/daemon/worker.clj | 2 +-
storm-core/src/clj/backtype/storm/util.clj | 9 ++-
storm-core/src/jvm/backtype/storm/Config.java | 11 +++
.../src/jvm/backtype/storm/LogWriter.java | 83 +++++++++++++++++++
.../templates/component-page-template.html | 2 +-
.../templates/topology-page-template.html | 4 +-
.../test/clj/backtype/storm/logviewer_test.clj | 8 +-
.../test/clj/backtype/storm/supervisor_test.clj | 30 ++++++-
storm-dist/binary/src/main/assembly/binary.xml | 8 +-
22 files changed, 397 insertions(+), 197 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/28558b34/bin/storm-config.cmd
----------------------------------------------------------------------
diff --git a/bin/storm-config.cmd b/bin/storm-config.cmd
index e185495..6794023 100644
--- a/bin/storm-config.cmd
+++ b/bin/storm-config.cmd
@@ -110,7 +110,7 @@ if not %STORM_LOGBACK_CONFIGURATION_DIR% == nil (
@rem
if not defined STORM_LOGBACK_CONFIGURATION_FILE (
- set STORM_LOGBACK_CONFIGURATION_FILE=%STORM_HOME%\logback\cluster.xml
+ set STORM_LOGBACK_CONFIGURATION_FILE=%STORM_HOME%\log4j2\cluster.xml
)
"%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" backtype.storm.command.config_value java.library.path > %CMD_TEMP_FILE%
@@ -126,7 +126,7 @@ FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (
:storm_opts
set STORM_OPTS=-Dstorm.options= -Dstorm.home=%STORM_HOME% -Djava.library.path=%JAVA_LIBRARY_PATH%;%JAVA_HOME%\bin;%JAVA_HOME%\lib;%JAVA_HOME%\jre\bin;%JAVA_HOME%\jre\lib
- set STORM_OPTS=%STORM_OPTS% -Dlogback.configurationFile=%STORM_LOGBACK_CONFIGURATION_FILE%
+ set STORM_OPTS=%STORM_OPTS% -Dlog4j.configurationFile=%STORM_LOGBACK_CONFIGURATION_FILE%
set STORM_OPTS=%STORM_OPTS% -Dstorm.log.dir=%STORM_LOG_DIR%
del /F %CMD_TEMP_FILE%
http://git-wip-us.apache.org/repos/asf/storm/blob/28558b34/bin/storm.py
----------------------------------------------------------------------
diff --git a/bin/storm.py b/bin/storm.py
index 455a4c0..1f371b2 100755
--- a/bin/storm.py
+++ b/bin/storm.py
@@ -76,7 +76,7 @@ if (not os.path.isfile(os.path.join(USER_CONF_DIR, "storm.yaml"))):
STORM_LIB_DIR = os.path.join(STORM_DIR, "lib")
STORM_BIN_DIR = os.path.join(STORM_DIR, "bin")
-STORM_LOGBACK_CONF_DIR = os.path.join(STORM_DIR, "logback")
+STORM_LOG4J_CONF_DIR = os.path.join(STORM_DIR, "log4j2")
init_storm_env()
@@ -326,12 +326,12 @@ def repl():
cppaths = [CLUSTER_CONF_DIR]
exec_storm_class("clojure.main", jvmtype="-client", extrajars=cppaths)
-def get_logback_conf_dir():
+def get_log4j_conf_dir():
cppaths = [CLUSTER_CONF_DIR]
- storm_logback_conf_dir = confvalue("storm.logback.conf.dir", cppaths)
- if(storm_logback_conf_dir == None or storm_logback_conf_dir == "nil"):
- storm_logback_conf_dir = STORM_LOGBACK_CONF_DIR
- return storm_logback_conf_dir
+ storm_log4j_conf_dir = confvalue("storm.logback.conf.dir", cppaths)
+ if(storm_log4j_conf_dir == None or storm_log4j_conf_dir == "nil"):
+ storm_log4j_conf_dir = STORM_LOG4J_CONF_DIR
+ return storm_log4j_conf_dir
def nimbus(klass="backtype.storm.daemon.nimbus"):
"""Syntax: [storm nimbus]
@@ -345,7 +345,8 @@ def nimbus(klass="backtype.storm.daemon.nimbus"):
cppaths = [CLUSTER_CONF_DIR]
jvmopts = parse_args(confvalue("nimbus.childopts", cppaths)) + [
"-Dlogfile.name=nimbus.log",
- "-Dlogback.configurationFile=" + os.path.join(get_logback_conf_dir(), "cluster.xml"),
+ "-Ddaemon.name=nimbus",
+ "-Dlog4j.configurationFile=" + os.path.join(get_log4j_conf_dir(), "cluster.xml"),
]
exec_storm_class(
klass,
@@ -365,7 +366,8 @@ def supervisor(klass="backtype.storm.daemon.supervisor"):
cppaths = [CLUSTER_CONF_DIR]
jvmopts = parse_args(confvalue("supervisor.childopts", cppaths)) + [
"-Dlogfile.name=supervisor.log",
- "-Dlogback.configurationFile=" + os.path.join(get_logback_conf_dir(), "cluster.xml"),
+ "-Ddaemon.name=supervisor",
+ "-Dlog4j.configurationFile=" + os.path.join(get_log4j_conf_dir(), "cluster.xml"),
]
exec_storm_class(
klass,
@@ -386,7 +388,8 @@ def ui():
cppaths = [CLUSTER_CONF_DIR]
jvmopts = parse_args(confvalue("ui.childopts", cppaths)) + [
"-Dlogfile.name=ui.log",
- "-Dlogback.configurationFile=" + os.path.join(get_logback_conf_dir(), "cluster.xml")
+ "-Ddaemon.name=ui",
+ "-Dlog4j.configurationFile=" + os.path.join(get_log4j_conf_dir(), "cluster.xml")
]
exec_storm_class(
"backtype.storm.ui.core",
@@ -407,7 +410,8 @@ def logviewer():
cppaths = [CLUSTER_CONF_DIR]
jvmopts = parse_args(confvalue("logviewer.childopts", cppaths)) + [
"-Dlogfile.name=logviewer.log",
- "-Dlogback.configurationFile=" + os.path.join(get_logback_conf_dir(), "cluster.xml")
+ "-Ddaemon.name=logviewer",
+ "-Dlog4j.configurationFile=" + os.path.join(get_log4j_conf_dir(), "cluster.xml")
]
exec_storm_class(
"backtype.storm.daemon.logviewer",
@@ -427,7 +431,8 @@ def drpc():
cppaths = [CLUSTER_CONF_DIR]
jvmopts = parse_args(confvalue("drpc.childopts", cppaths)) + [
"-Dlogfile.name=drpc.log",
- "-Dlogback.configurationFile=" + os.path.join(get_logback_conf_dir(), "cluster.xml")
+ "-Ddaemon.name=drpc",
+ "-Dlog4j.configurationFile=" + os.path.join(get_log4j_conf_dir(), "cluster.xml")
]
exec_storm_class(
"backtype.storm.daemon.drpc",
http://git-wip-us.apache.org/repos/asf/storm/blob/28558b34/conf/log4j2.xml
----------------------------------------------------------------------
diff --git a/conf/log4j2.xml b/conf/log4j2.xml
new file mode 100644
index 0000000..cfc8330
--- /dev/null
+++ b/conf/log4j2.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<configuration monitorInterval="60">
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%-4r [%t] %-5p %c{1.} - %msg%n"/>
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Logger name="org.apache.zookeeper" level="WARN"/>
+ <Root level="info">
+ <AppenderRef ref="Console"/>
+ </Root>
+ </Loggers>
+</configuration>
+
http://git-wip-us.apache.org/repos/asf/storm/blob/28558b34/conf/logback.xml
----------------------------------------------------------------------
diff --git a/conf/logback.xml b/conf/logback.xml
deleted file mode 100644
index 7ccaae6..0000000
--- a/conf/logback.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration scan="true" scanPeriod="30 seconds">
- <appender name="A1" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%-4r [%t] %-5p %c - %m%n</pattern>
- </encoder>
- </appender>
- <logger name="org.apache.zookeeper" level="WARN"/>
- <root level="INFO">
- <appender-ref ref="A1"/>
- </root>
-</configuration>
http://git-wip-us.apache.org/repos/asf/storm/blob/28558b34/log4j2/cluster.xml
----------------------------------------------------------------------
diff --git a/log4j2/cluster.xml b/log4j2/cluster.xml
new file mode 100644
index 0000000..2301e21
--- /dev/null
+++ b/log4j2/cluster.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<configuration monitorInterval="60">
+<properties>
+ <property name="pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} %c{1.} [%p] %msg%n</property>
+ <property name="patternMetris">%d %-8r %m%n</property>
+</properties>
+<appenders>
+ <RollingFile name="A1"
+ fileName="${sys:storm.home}/logs/${sys:logfile.name}"
+ filePattern="${sys:storm.home}/logs/${sys:logfile.name}.%i">
+ <PatternLayout>
+ <pattern>${pattern}</pattern>
+ </PatternLayout>
+ <Policies>
+ <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB -->
+ <DefaultRolloverStrategy max="9"/>
+ </Policies>
+ </RollingFile>
+ <RollingFile name="ACCESS"
+ fileName="${sys:storm.home}/logs/access.log"
+ filePattern="${sys:storm.home}/logs/access.log.%i">
+ <PatternLayout>
+ <pattern>${pattern}</pattern>
+ </PatternLayout>
+ <Policies>
+ <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB -->
+ <DefaultRolloverStrategy max="9"/>
+ </Policies>
+ </RollingFile>
+ <RollingFile name="METRICS"
+ fileName="${sys:storm.home}/logs/metrics.log"
+ filePattern="${sys:storm.home}/logs/metrics.log.%i">
+ <PatternLayout>
+ <pattern>${patternMetris}</pattern>
+ </PatternLayout>
+ <Policies>
+ <SizeBasedTriggeringPolicy size="2 MB"/> <!-- Or every 100 MB -->
+ <DefaultRolloverStrategy max="9"/>
+ </Policies>
+ </RollingFile>
+ <Syslog name="syslog" format="RFC5424" host="localhost" port="514"
+ protocol="UDP" appName="[${sys:daemon.name}]" mdcId="mdc" includeMDC="true"
+ facility="LOCAL5" enterpriseNumber="18060" newLine="true" exceptionPattern="%rEx{full}"
+ messageId="[${sys:user.name}:S0]" id="storm"/>
+</appenders>
+<loggers>
+
+ <Logger name="backtype.storm.security.auth.authorizer" level="info">
+ <AppenderRef ref="ACCESS"/>
+ </Logger>
+ <Logger name="backtype.storm.metric.LoggingMetricsConsumer" level="info">
+ <AppenderRef ref="METRICS"/>
+ </Logger>
+ <root level="info"> <!-- We log everything -->
+ <appender-ref ref="A1"/>
+ <appender-ref ref="syslog"/>
+ </root>
+</loggers>
+</configuration>
http://git-wip-us.apache.org/repos/asf/storm/blob/28558b34/log4j2/worker.xml
----------------------------------------------------------------------
diff --git a/log4j2/worker.xml b/log4j2/worker.xml
new file mode 100644
index 0000000..54d612c
--- /dev/null
+++ b/log4j2/worker.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<configuration monitorInterval="60">
+<properties>
+ <property name="pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} %c{1.} [%p] %msg%n</property>
+ <property name="patternNoTime">%msg%n</property>
+</properties>
+<appenders>
+ <RollingFile name="A1"
+ fileName="${sys:storm.home}/logs/${sys:logfile.name}"
+ filePattern="${sys:storm.home}/logs/${sys:logfile.name}.%i.gz">
+ <PatternLayout>
+ <pattern>${pattern}</pattern>
+ </PatternLayout>
+ <Policies>
+ <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB -->
+ <DefaultRolloverStrategy max="9"/>
+ </Policies>
+ </RollingFile>
+ <RollingFile name="STDOUT"
+ fileName="${sys:storm.home}/logs/${sys:logfile.name}.out"
+ filePattern="${sys:storm.home}/logs/${sys:logfile.name}.out.%i.gz">
+ <PatternLayout>
+ <pattern>${patternNoTime}</pattern>
+ </PatternLayout>
+ <Policies>
+ <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB -->
+ <DefaultRolloverStrategy max="4"/>
+ </Policies>
+ </RollingFile>
+ <RollingFile name="STDERR"
+ fileName="${sys:storm.home}/logs/${sys:logfile.name}.err"
+ filePattern="${sys:storm.home}/logs/${sys:logfile.name}.err.%i.gz">
+ <PatternLayout>
+ <pattern>${patternNoTime}</pattern>
+ </PatternLayout>
+ <Policies>
+ <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB -->
+ <DefaultRolloverStrategy max="4"/>
+ </Policies>
+ </RollingFile>
+ <Syslog name="syslog" format="RFC5424" host="localhost" port="514"
+ protocol="UDP" appName="[${sys:storm.id}:${sys:worker.port}]" mdcId="mdc" includeMDC="true"
+ facility="LOCAL5" enterpriseNumber="18060" newLine="true" exceptionPattern="%rEx{full}"
+ messageId="[${sys:user.name}:${sys:logging.sensitivity}]" id="storm"/>
+</appenders>
+<loggers>
+ <root level="info"> <!-- We log everything -->
+ <appender-ref ref="A1"/>
+ <appender-ref ref="syslog"/>
+ </root>
+ <Logger name="STDERR" level="INFO">
+ <appender-ref ref="STDERR"/>
+ <appender-ref ref="syslog"/>
+ </Logger>
+ <Logger name="STDOUT" level="INFO">
+ <appender-ref ref="STDOUT"/>
+ <appender-ref ref="syslog"/>
+ </Logger>
+</loggers>
+</configuration>
http://git-wip-us.apache.org/repos/asf/storm/blob/28558b34/logback/cluster.xml
----------------------------------------------------------------------
diff --git a/logback/cluster.xml b/logback/cluster.xml
deleted file mode 100644
index 487e119..0000000
--- a/logback/cluster.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<configuration scan="true" scanPeriod="60 seconds">
- <appender name="A1" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${storm.log.dir}/${logfile.name}</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${storm.log.dir}/${logfile.name}.%i</fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>9</maxIndex>
- </rollingPolicy>
-
- <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>100MB</maxFileSize>
- </triggeringPolicy>
-
- <encoder>
- <pattern>%d{yyyy-MM-dd'T'HH:mm:ss.SSSZZ} %c{1} [%p] %m%n</pattern>
- </encoder>
- </appender>
-
- <appender name="ACCESS" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${storm.log.dir}/access.log</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${storm.log.dir}/access.log.%i</fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>9</maxIndex>
- </rollingPolicy>
-
- <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>100MB</maxFileSize>
- </triggeringPolicy>
-
- <encoder>
- <pattern>%d{yyyy-MM-dd'T'HH:mm:ss.SSSZZ} %c{1} [%p] %m%n</pattern>
- </encoder>
- </appender>
-
- <appender name="METRICS" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${storm.log.dir}/metrics.log</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${storm.log.dir}/metrics.log.%i</fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>9</maxIndex>
- </rollingPolicy>
-
- <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>2MB</maxFileSize>
- </triggeringPolicy>
-
- <encoder>
- <pattern>%d %-8r %m%n</pattern>
- </encoder>
- </appender>
-
- <root level="INFO">
- <appender-ref ref="A1"/>
- </root>
-
- <logger name="backtype.storm.security.auth.authorizer" additivity="false">
- <level value="INFO" />
- <appender-ref ref="ACCESS" />
- </logger>
-
- <logger name="backtype.storm.metric.LoggingMetricsConsumer" additivity="false" >
- <level value="INFO"/>
- <appender-ref ref="METRICS"/>
- </logger>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/storm/blob/28558b34/logback/worker.xml
----------------------------------------------------------------------
diff --git a/logback/worker.xml b/logback/worker.xml
deleted file mode 100644
index 3d9009e..0000000
--- a/logback/worker.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<configuration scan="true" scanPeriod="60 seconds">
- <appender name="A1" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${storm.log.dir}/${logfile.name}</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${storm.log.dir}/${logfile.name}.%i</fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>9</maxIndex>
- </rollingPolicy>
-
- <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>100MB</maxFileSize>
- </triggeringPolicy>
-
- <encoder>
- <pattern>%d{yyyy-MM-dd HH:mm:ss} %c{1} [%p] %m%n</pattern>
- </encoder>
- </appender>
-
- <root level="INFO">
- <appender-ref ref="A1"/>
- </root>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/storm/blob/28558b34/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2e0c898..0b931b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -208,9 +208,9 @@
<disruptor.version>2.10.1</disruptor.version>
<jgrapht.version>0.9.0</jgrapht.version>
<guava.version>16.0.1</guava.version>
- <logback-classic.version>1.0.13</logback-classic.version>
- <log4j-over-slf4j.version>1.6.6</log4j-over-slf4j.version>
<netty.version>3.9.0.Final</netty.version>
+ <log4j-over-slf4j.version>1.6.6</log4j-over-slf4j.version>
+ <log4j.version>2.1</log4j.version>
<clojure.tools.nrepl.version>0.2.3</clojure.tools.nrepl.version>
<clojure-complete.version>0.2.3</clojure-complete.version>
<mockito.version>1.9.5</mockito.version>
@@ -467,9 +467,24 @@
<version>${guava.version}</version>
</dependency>
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback-classic.version}</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${log4j-over-slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/storm/blob/28558b34/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 765a1dd..18992f2 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -200,8 +200,16 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/storm/blob/28558b34/storm-core/src/clj/backtype/storm/daemon/logviewer.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/logviewer.clj b/storm-core/src/clj/backtype/storm/daemon/logviewer.clj
index 1c24440..8a38df6 100644
--- a/storm-core/src/clj/backtype/storm/daemon/logviewer.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/logviewer.clj
@@ -21,9 +21,10 @@
(:use [backtype.storm config util log timer])
(:use [backtype.storm.ui helpers])
(:import [org.slf4j LoggerFactory])
- (:import [ch.qos.logback.classic Logger])
- (:import [ch.qos.logback.core FileAppender])
(:import [java.io File FileFilter FileInputStream])
+ (:import [org.apache.logging.log4j LogManager])
+ (:import [org.apache.logging.log4j.core Appender LoggerContext])
+ (:import [org.apache.logging.log4j.core.appender RollingFileAppender])
(:import [org.yaml.snakeyaml Yaml]
[org.yaml.snakeyaml.constructor SafeConstructor])
(:import [backtype.storm.ui InvalidRequestException]
@@ -210,9 +211,9 @@
Note that if anything goes wrong, this will throw an Error and exit."
[appender-name]
- (let [appender (.getAppender (LoggerFactory/getLogger Logger/ROOT_LOGGER_NAME) appender-name)]
- (if (and appender-name appender (instance? FileAppender appender))
- (.getParent (File. (.getFile appender)))
+ (let [appender (.getAppender (.getConfiguration (LogManager/getContext)) appender-name)]
+ (if (and appender-name appender (instance? RollingFileAppender appender))
+ (.getParent (File. (.getFileName appender)))
(throw
(RuntimeException. "Log viewer could not find configured appender, or the appender is not a FileAppender. Please check that the appender name configured in storm and logback agree.")))))
http://git-wip-us.apache.org/repos/asf/storm/blob/28558b34/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
index e079ba4..f23d9b1 100644
--- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
@@ -1089,7 +1089,10 @@
(when (and (Utils/isZkAuthenticationConfiguredStormServer conf)
(not (Utils/isZkAuthenticationConfiguredTopology storm-conf)))
(throw (IllegalArgumentException. "The cluster is configured for zookeeper authentication, but no payload was provided.")))
- (log-message "Received topology submission for " storm-name " with conf " storm-conf)
+ (log-message "Received topology submission for "
+ storm-name
+ " with conf "
+ (redact-value storm-conf STORM-ZOOKEEPER-TOPOLOGY-AUTH-PAYLOAD))
;; lock protects against multiple topologies being submitted at once and
;; cleanup thread killing topology in b/w assignment and starting the topology
(locking (:submit-lock nimbus)
http://git-wip-us.apache.org/repos/asf/storm/blob/28558b34/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
index 0517294..41533df 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -660,7 +660,7 @@
storm-log-dir (or (System/getProperty "storm.log.dir") (str storm-home file-path-separator "logs"))
storm-conf (read-storm-config)
storm-log-conf-dir (storm-conf "storm.logback.conf.dir")
- storm-logback-conf-dir (or storm-log-conf-dir (str storm-home file-path-separator "logback"))
+ storm-logback-conf-dir (or storm-log-conf-dir (str storm-home file-path-separator "log4j2"))
stormroot (supervisor-stormdist-root conf storm-id)
jlp (jlp stormroot conf)
stormjar (supervisor-stormjar-path stormroot)
@@ -674,6 +674,7 @@
top-gc-opts (storm-conf TOPOLOGY-WORKER-GC-CHILDOPTS)
gc-opts (substitute-childopts (if top-gc-opts top-gc-opts (conf WORKER-GC-CHILDOPTS)) worker-id storm-id port)
user (storm-conf TOPOLOGY-SUBMITTER-USER)
+ logging-sensitivity (storm-conf TOPOLOGY-LOGGING-SENSITIVITY "S3")
logfilename (logs-filename storm-id port)
worker-childopts (when-let [s (conf WORKER-CHILDOPTS)]
(substitute-childopts s worker-id storm-id port))
@@ -683,6 +684,14 @@
(merge env {"LD_LIBRARY_PATH" jlp})
{"LD_LIBRARY_PATH" jlp})
command (concat
+ [(java-cmd) "-cp" classpath
+ (str "-Dlogfile.name=" logfilename)
+ (str "-Dstorm.home=" storm-home)
+ (str "-Dstorm.id=" storm-id)
+ (str "-Dworker.id=" worker-id)
+ (str "-Dworker.port=" port)
+ (str "-Dlog4j.configurationFile=" storm-logback-conf-dir file-path-separator "worker.xml")
+ "backtype.storm.LogWriter"]
[(java-cmd) "-server"]
worker-childopts
topo-worker-childopts
@@ -693,7 +702,8 @@
(str "-Dstorm.conf.file=" storm-conf-file)
(str "-Dstorm.options=" storm-options)
(str "-Dstorm.log.dir=" storm-log-dir)
- (str "-Dlogback.configurationFile=" storm-logback-conf-dir file-path-separator "worker.xml")
+ (str "-Dlogging.sensitivity=" logging-sensitivity)
+ (str "-Dlog4j.configurationFile=" storm-logback-conf-dir file-path-separator "worker.xml")
(str "-Dstorm.id=" storm-id)
(str "-Dworker.id=" worker-id)
(str "-Dworker.port=" port)
http://git-wip-us.apache.org/repos/asf/storm/blob/28558b34/storm-core/src/clj/backtype/storm/daemon/worker.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/worker.clj b/storm-core/src/clj/backtype/storm/daemon/worker.clj
index 038c20b..38ec381 100644
--- a/storm-core/src/clj/backtype/storm/daemon/worker.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/worker.clj
@@ -518,7 +518,7 @@
(schedule-recurring (:refresh-connections-timer worker) 0 (conf TASK-REFRESH-POLL-SECS) refresh-connections)
(schedule-recurring (:refresh-active-timer worker) 0 (conf TASK-REFRESH-POLL-SECS) (partial refresh-storm-active worker))
- (log-message "Worker has topology config " (:storm-conf worker))
+ (log-message "Worker has topology config " (redact-value (:storm-conf worker) STORM-ZOOKEEPER-TOPOLOGY-AUTH-PAYLOAD))
(log-message "Worker " worker-id " for storm " storm-id " on " assignment-id ":" port " has finished loading")
ret
))))))
http://git-wip-us.apache.org/repos/asf/storm/blob/28558b34/storm-core/src/clj/backtype/storm/util.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/util.clj b/storm-core/src/clj/backtype/storm/util.clj
index 70e166a..3fd9f2a 100644
--- a/storm-core/src/clj/backtype/storm/util.clj
+++ b/storm-core/src/clj/backtype/storm/util.clj
@@ -1026,7 +1026,7 @@
(defn logs-metadata-filename [storm-id port]
(str (logs-rootname storm-id port) ".yaml"))
-(def worker-log-filename-pattern #"((.*-\d+-\d+)-worker-(\d+)).log")
+(def worker-log-filename-pattern #"^((.*-\d+-\d+)-worker-(\d+))\.log")
(defn get-log-metadata-file
([fname]
@@ -1058,3 +1058,10 @@
(log-error err "Received error in main thread.. terminating server...")
(.exit (Runtime/getRuntime) -2))))))))
+(defn redact-value
+ "Hides value for k in coll for printing coll safely"
+ [coll k]
+ (if (contains? coll k)
+ (assoc coll k (apply str (repeat (count (coll k)) "#")))
+ coll))
+
http://git-wip-us.apache.org/repos/asf/storm/blob/28558b34/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/Config.java b/storm-core/src/jvm/backtype/storm/Config.java
index a881cb4..b7ee27c 100644
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@ -1305,6 +1305,17 @@ public class Config extends HashMap<String, Object> {
public static final Object TOPOLOGY_SHELLBOLT_MAX_PENDING_SCHEMA = ConfigValidation.IntegerValidator;
/**
+ * Topology central logging sensitivity to determine who has access to logs in central logging system.
+ * The possible values are:
+ * S0 - Public (open to all users on grid)
+ * S1 - Restricted
+ * S2 - Confidential
+ * S3 - Secret (default.)
+ */
+ public static final String TOPOLOGY_LOGGING_SENSITIVITY="topology.logging.sensitivity";
+ public static final Object TOPOLOGY_LOGGING_SENSITIVITY_SCHEMA = String.class;
+
+ /**
* The root directory in ZooKeeper for metadata about TransactionalSpouts.
*/
public static final String TRANSACTIONAL_ZOOKEEPER_ROOT="transactional.zookeeper.root";
http://git-wip-us.apache.org/repos/asf/storm/blob/28558b34/storm-core/src/jvm/backtype/storm/LogWriter.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/LogWriter.java b/storm-core/src/jvm/backtype/storm/LogWriter.java
new file mode 100644
index 0000000..b0857e8
--- /dev/null
+++ b/storm-core/src/jvm/backtype/storm/LogWriter.java
@@ -0,0 +1,83 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package backtype.storm;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.InputStream;
+import java.io.IOException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Launch a sub process and write files out to logs.
+ */
+public class LogWriter extends Thread {
+ private Logger logger;
+ private BufferedReader in;
+
+ public LogWriter(InputStream in, Logger logger) {
+ this.in = new BufferedReader(new InputStreamReader(in));
+ this.logger = logger;
+ }
+
+ public void run() {
+ Logger logger = this.logger;
+ BufferedReader in = this.in;
+ String line = null;
+ try {
+ while ((line = in.readLine()) != null) {
+ logger.info(line);
+ }
+ } catch (IOException e) {
+ logger.error("Internal ERROR", e);
+ } finally {
+ try {
+ in.close();
+ } catch (IOException e) {
+ logger.error("Internal ERROR", e);
+ }
+ }
+ }
+
+ public void close() throws Exception {
+ this.join();
+ }
+
+ public static void main(String [] args) throws Exception {
+ ProcessBuilder pb = new ProcessBuilder(args);
+ Process p = pb.start();
+ LogWriter err = null;
+ LogWriter in = null;
+ int ret = -1;
+ try {
+ Logger logger = LoggerFactory.getLogger("STDERR");
+ err = new LogWriter(p.getErrorStream(), logger);
+ err.start();
+ in = new LogWriter(p.getInputStream(), logger);
+ in.start();
+ ret = p.waitFor();
+ } finally {
+ if (err != null) err.close();
+ if (in != null) in.close();
+ }
+ System.exit(ret);
+ }
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/28558b34/storm-core/src/ui/public/templates/component-page-template.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/templates/component-page-template.html b/storm-core/src/ui/public/templates/component-page-template.html
index 4882e1e..440628a 100644
--- a/storm-core/src/ui/public/templates/component-page-template.html
+++ b/storm-core/src/ui/public/templates/component-page-template.html
@@ -479,7 +479,7 @@
<td>{{errorHost}}</td>
<td><a href="{{errorWorkerLogLink}}">{{errorPort}}</a></td>
<td>
- <span id="{{errorLapsedSecs}}" class="errorSpan"><a href="{{errorWorkerLogLink}}">{{error}}</a></span>
+ <span id="{{errorLapsedSecs}}" class="errorSpan">{{error}}</span>
</td>
</tr>
{{/componentErrors}}
http://git-wip-us.apache.org/repos/asf/storm/blob/28558b34/storm-core/src/ui/public/templates/topology-page-template.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/templates/topology-page-template.html b/storm-core/src/ui/public/templates/topology-page-template.html
index da7929c..ddf89b7 100644
--- a/storm-core/src/ui/public/templates/topology-page-template.html
+++ b/storm-core/src/ui/public/templates/topology-page-template.html
@@ -242,7 +242,7 @@
<td>{{errorHost}}</td>
<td><a href="{{errorWorkerLogLink}}">{{errorPort}}</a></td>
<td>
- <span id="{{errorLapsedSecs}}" class="errorSpan"><a href="{{errorWorkerLogLink}}">{{lastError}}</a></span>
+ <span id="{{errorLapsedSecs}}" class="errorSpan">{{lastError}}</span>
</td>
{{/spouts}}
</tbody>
@@ -331,7 +331,7 @@
<td>{{errorHost}}</td>
<td><a href="{{errorWorkerLogLink}}">{{errorPort}}</a></td>
<td>
- <span id="{{errorLapsedSecs}}" class="errorSpan"><a href="{{errorWorkerLogLink}}">{{lastError}}</a></span>
+ <span id="{{errorLapsedSecs}}" class="errorSpan">{{lastError}}</span>
</td>
{{/bolts}}
</tbody>
http://git-wip-us.apache.org/repos/asf/storm/blob/28558b34/storm-core/test/clj/backtype/storm/logviewer_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/logviewer_test.clj b/storm-core/test/clj/backtype/storm/logviewer_test.clj
index 23fa0b9..a790ddf 100644
--- a/storm-core/test/clj/backtype/storm/logviewer_test.clj
+++ b/storm-core/test/clj/backtype/storm/logviewer_test.clj
@@ -91,10 +91,14 @@
(deftest test-get-log-root->files-map
(testing "returns map of root name to list of files"
(let [files (vec (map #(java.io.File. %) ["log-1-2-worker-3.log"
+ "log-1-2-worker-3.log.1.gz"
+ "log-1-2-worker-3.log.err"
+ "log-1-2-worker-3.log.out"
+ "log-1-2-worker-3.log.out.1.gz"
"log-1-2-worker-3.log.1"
"log-2-4-worker-6.log.1"]))
- expected {"log-1-2-worker-3" #{(files 0) (files 1)}
- "log-2-4-worker-6" #{(files 2)}}]
+ expected {"log-1-2-worker-3" #{(files 0) (files 1) (files 2) (files 3) (files 4) (files 5)}
+ "log-2-4-worker-6" #{(files 6)}}]
(is (= expected (logviewer/get-log-root->files-map files))))))
(deftest test-identify-worker-log-files
http://git-wip-us.apache.org/repos/asf/storm/blob/28558b34/storm-core/test/clj/backtype/storm/supervisor_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/supervisor_test.clj b/storm-core/test/clj/backtype/storm/supervisor_test.clj
index 4c029dd..dcb8dab 100644
--- a/storm-core/test/clj/backtype/storm/supervisor_test.clj
+++ b/storm-core/test/clj/backtype/storm/supervisor_test.clj
@@ -252,8 +252,18 @@
mock-storm-id "fake-storm-id"
mock-worker-id "fake-worker-id"
mock-cp (str file-path-separator "base" class-path-separator file-path-separator "stormjar.jar")
+ mock-sensitivity "S3"
+ mock-cp "/base:/stormjar.jar"
exp-args-fn (fn [opts topo-opts classpath]
- (concat [(supervisor/java-cmd) "-server"]
+ (concat [(supervisor/java-cmd) "-cp" classpath
+ (str "-Dlogfile.name=" mock-storm-id "-worker-" mock-port ".log")
+ "-Dstorm.home="
+ (str "-Dstorm.id=" mock-storm-id)
+ (str "-Dworker.id=" mock-worker-id)
+ (str "-Dworker.port=" mock-port)
+ "-Dlog4j.configurationFile=/log4j2/worker.xml"
+ "backtype.storm.LogWriter"]
+ [(supervisor/java-cmd) "-server"]
opts
topo-opts
["-Djava.library.path="
@@ -262,7 +272,8 @@
"-Dstorm.conf.file="
"-Dstorm.options="
(str "-Dstorm.log.dir=" file-path-separator "logs")
- (str "-Dlogback.configurationFile=" file-path-separator "logback" file-path-separator "worker.xml")
+ (str "-Dlogging.sensitivity=" mock-sensitivity)
+ (str "-Dlog4j.configurationFile=" file-path-separator "log4j2" file-path-separator "worker.xml")
(str "-Dstorm.id=" mock-storm-id)
(str "-Dworker.id=" mock-worker-id)
(str "-Dworker.port=" mock-port)
@@ -364,6 +375,7 @@
(let [mock-port "42"
mock-storm-id "fake-storm-id"
mock-worker-id "fake-worker-id"
+ mock-sensitivity "S3"
mock-cp "mock-classpath'quote-on-purpose"
storm-local (str "/tmp/" (UUID/randomUUID))
worker-script (str storm-local "/workers/" mock-worker-id "/storm-worker-script.sh")
@@ -373,7 +385,16 @@
(str storm-local "/workers/" mock-worker-id)
worker-script]
exp-script-fn (fn [opts topo-opts]
- (str "#!/bin/bash\n'export' 'LD_LIBRARY_PATH=';\n\nexec 'java' '-server'"
+ (str "#!/bin/bash\n'export' 'LD_LIBRARY_PATH=';\n\nexec 'java'"
+ " '-cp' 'mock-classpath'\"'\"'quote-on-purpose'"
+ " '-Dlogfile.name=" mock-storm-id "-worker-" mock-port ".log'"
+ " '-Dstorm.home='"
+ " '-Dstorm.id=" mock-storm-id "'"
+ " '-Dworker.id=" mock-worker-id "'"
+ " '-Dworker.port=" mock-port "'"
+ " '-Dlog4j.configurationFile=/log4j2/worker.xml'"
+ " 'backtype.storm.LogWriter'"
+ " 'java' '-server'"
" " (shell-cmd opts)
" " (shell-cmd topo-opts)
" '-Djava.library.path='"
@@ -382,7 +403,8 @@
" '-Dstorm.conf.file='"
" '-Dstorm.options='"
" '-Dstorm.log.dir=/logs'"
- " '-Dlogback.configurationFile=/logback/worker.xml'"
+ " '-Dlogging.sensitivity=" mock-sensitivity "'"
+ " '-Dlog4j.configurationFile=/log4j2/worker.xml'"
" '-Dstorm.id=" mock-storm-id "'"
" '-Dworker.id=" mock-worker-id "'"
" '-Dworker.port=" mock-port "'"
http://git-wip-us.apache.org/repos/asf/storm/blob/28558b34/storm-dist/binary/src/main/assembly/binary.xml
----------------------------------------------------------------------
diff --git a/storm-dist/binary/src/main/assembly/binary.xml b/storm-dist/binary/src/main/assembly/binary.xml
index fef56bb..14d05f9 100644
--- a/storm-dist/binary/src/main/assembly/binary.xml
+++ b/storm-dist/binary/src/main/assembly/binary.xml
@@ -202,13 +202,13 @@
</file>
<!-- TODO this should be a generated file from "target" -->
<file>
- <source>${project.basedir}/../../logback/cluster.xml</source>
- <outputDirectory>/logback</outputDirectory>
+ <source>${project.basedir}/../../log4j2/cluster.xml</source>
+ <outputDirectory>/log4j2</outputDirectory>
</file>
<file>
- <source>${project.basedir}/../../logback/worker.xml</source>
- <outputDirectory>/logback</outputDirectory>
+ <source>${project.basedir}/../../log4j2/worker.xml</source>
+ <outputDirectory>/log4j2</outputDirectory>
</file>
<file>
[22/28] storm git commit: add STORM-853 to changelog
Posted by pt...@apache.org.
add STORM-853 to changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1baaeb06
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1baaeb06
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1baaeb06
Branch: refs/heads/0.10.x-branch
Commit: 1baaeb0688e89fa0df9a019ef0aa181a26923d06
Parents: 97e3fac
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Jun 9 14:20:50 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Jun 9 14:20:50 2015 -0400
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/1baaeb06/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 999c492..81224c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
## 0.11.0
## 0.10.0
+ * STORM-853 Fix upload API to handle multi-args properly
* STORM-850: Convert storm-core's logback-test.xml to log4j2-test.xml
* STORM-848: Shade external dependencies
* STORM-849: Add storm-redis to storm binary distribution
[19/28] storm git commit: STORM-853 Fix upload API to handle
multi-args properly
Posted by pt...@apache.org.
STORM-853 Fix upload API to handle multi-args properly
* flatten arguments so that it can be treated to each arguments
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/edd9baba
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/edd9baba
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/edd9baba
Branch: refs/heads/0.10.x-branch
Commit: edd9baba1e9f976c8c3d1a2b591ebf33e418a351
Parents: 9579c0b
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Jun 6 13:25:11 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Jun 6 13:25:11 2015 +0900
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/ui/core.clj | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/edd9baba/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/ui/core.clj b/storm-core/src/clj/backtype/storm/ui/core.clj
index c440043..7fcdb47 100644
--- a/storm-core/src/clj/backtype/storm/ui/core.clj
+++ b/storm-core/src/clj/backtype/storm/ui/core.clj
@@ -515,8 +515,7 @@
(defn run-tplg-submit-cmd [tplg-jar-file tplg-config user]
(let [tplg-main-class (if (not-nil? tplg-config) (trim (tplg-config "topologyMainClass")))
- tplg-main-class-args (if (not-nil? tplg-config) (clojure.string/join " " (tplg-config "topologyMainClassArgs")))
- tplg-jvm-opts (if (not-nil? tplg-config) (clojure.string/join " " (tplg-config "topologyJvmOpts")))
+ tplg-main-class-args (if (not-nil? tplg-config) (tplg-config "topologyMainClassArgs"))
storm-home (System/getProperty "storm.home")
storm-conf-dir (str storm-home file-path-separator "conf")
storm-log-dir (if (not-nil? (*STORM-CONF* "storm.log.dir")) (*STORM-CONF* "storm.log.dir")
@@ -524,10 +523,10 @@
storm-libs (str storm-home file-path-separator "lib" file-path-separator "*")
java-cmd (str (System/getProperty "java.home") file-path-separator "bin" file-path-separator "java")
storm-cmd (str storm-home file-path-separator "bin" file-path-separator "storm")
- tplg-cmd-response (sh storm-cmd "jar" tplg-jar-file
- tplg-main-class
- tplg-main-class-args
- (if (not= user "unknown") (str "-c storm.doAsUser=" user) ""))]
+ tplg-cmd-response (apply sh
+ (flatten
+ [storm-cmd "jar" tplg-jar-file tplg-main-class tplg-main-class-args
+ (if (not= user "unknown") (str "-c storm.doAsUser=" user) "")]))]
(log-message "tplg-cmd-response " tplg-cmd-response)
(cond
(= (tplg-cmd-response :exit) 0) {"status" "success"}
[17/28] storm git commit: Added STORM-850 to Changelog
Posted by pt...@apache.org.
Added STORM-850 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9579c0b0
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9579c0b0
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9579c0b0
Branch: refs/heads/0.10.x-branch
Commit: 9579c0b04ae3460a19961c81e714c2fa3b541e3c
Parents: b63cfd8
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Jun 5 12:24:38 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Jun 5 12:24:38 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/9579c0b0/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ecc3bf6..999c492 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
## 0.11.0
## 0.10.0
+ * STORM-850: Convert storm-core's logback-test.xml to log4j2-test.xml
* STORM-848: Shade external dependencies
* STORM-849: Add storm-redis to storm binary distribution
* STORM-760: Use JSON for serialized conf