You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by xi...@apache.org on 2018/01/09 01:26:00 UTC
[19/33] samza-hello-samza git commit: SAMZA-1237: Modified the script
to pass properties implicitly and fixed typos in configuration
SAMZA-1237: Modified the script to pass properties implicitly and fixed typos in configuration
Addressed usability comments and fixed configurations. navina
Author: Bharath Kumarasubramanian <bk...@linkedin.com>
Reviewers: Jagadish <jv...@linkedin.com>
Closes #14 from bharathkk/latest
Project: http://git-wip-us.apache.org/repos/asf/samza-hello-samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/samza-hello-samza/commit/01fb4569
Tree: http://git-wip-us.apache.org/repos/asf/samza-hello-samza/tree/01fb4569
Diff: http://git-wip-us.apache.org/repos/asf/samza-hello-samza/diff/01fb4569
Branch: refs/heads/master
Commit: 01fb45698164ccee3ca049be859b553c636e71fa
Parents: 591aaeb
Author: Bharath Kumarasubramanian <bk...@linkedin.com>
Authored: Thu May 18 12:22:21 2017 -0700
Committer: Jacob Maes <jm...@linkedin.com>
Committed: Thu May 18 12:22:21 2017 -0700
----------------------------------------------------------------------
bin/grid | 2 +-
bin/run-wikipedia-standalone-application.sh | 2 +-
src/main/assembly/src.xml | 2 +-
.../wikipedia-application-local-runner.properties | 3 +--
.../application/WikipediaZkLocalApplication.java | 13 ++++++++++---
5 files changed, 14 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/samza-hello-samza/blob/01fb4569/bin/grid
----------------------------------------------------------------------
diff --git a/bin/grid b/bin/grid
index 5f715b5..5dff403 100755
--- a/bin/grid
+++ b/bin/grid
@@ -56,7 +56,7 @@ bootstrap() {
}
standalone() {
- echo "Setting up the ystem..."
+ echo "Setting up the system..."
stop_all
rm -rf "$DEPLOY_ROOT_DIR"
mkdir "$DEPLOY_ROOT_DIR"
http://git-wip-us.apache.org/repos/asf/samza-hello-samza/blob/01fb4569/bin/run-wikipedia-standalone-application.sh
----------------------------------------------------------------------
diff --git a/bin/run-wikipedia-standalone-application.sh b/bin/run-wikipedia-standalone-application.sh
index f750e2b..6feea52 100755
--- a/bin/run-wikipedia-standalone-application.sh
+++ b/bin/run-wikipedia-standalone-application.sh
@@ -27,4 +27,4 @@ mkdir -p $EXECUTION_PLAN_DIR
[[ $JAVA_OPTS != *-Dlog4j.configuration* ]] && export JAVA_OPTS="$JAVA_OPTS -Dlog4j.configuration=file:$(dirname $0)/log4j-console.xml"
-exec $(dirname $0)/run-class.sh samza.examples.wikipedia.application.WikipediaZkLocalApplication "$@"
+exec $(dirname $0)/run-class.sh samza.examples.wikipedia.application.WikipediaZkLocalApplication --config-factory=org.apache.samza.config.factories.PropertiesConfigFactory --config-path=file://$PWD/deploy/samza/config/wikipedia-application-local-runner.properties
http://git-wip-us.apache.org/repos/asf/samza-hello-samza/blob/01fb4569/src/main/assembly/src.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml
index 69cbbbe..7832af5 100644
--- a/src/main/assembly/src.xml
+++ b/src/main/assembly/src.xml
@@ -45,7 +45,7 @@
<outputDirectory>lib</outputDirectory>
</file>
<file>
- <source>${basedir}/bin/run-local-app.sh</source>
+ <source>${basedir}/bin/run-wikipedia-standalone-application.sh</source>
<outputDirectory>bin</outputDirectory>
</file>
</files>
http://git-wip-us.apache.org/repos/asf/samza-hello-samza/blob/01fb4569/src/main/config/wikipedia-application-local-runner.properties
----------------------------------------------------------------------
diff --git a/src/main/config/wikipedia-application-local-runner.properties b/src/main/config/wikipedia-application-local-runner.properties
index 965a131..32b0290 100644
--- a/src/main/config/wikipedia-application-local-runner.properties
+++ b/src/main/config/wikipedia-application-local-runner.properties
@@ -22,11 +22,10 @@ job.default.system=kafka
coordinator.zk.connect=localhost:2181
# Task/Application
-app.processor-id-generator.class=org.apache.samza.runtime.UUIDGenerator
task.name.grouper.factory=org.apache.samza.container.grouper.task.GroupByContainerIdsFactory
# Serializers
-serializers.registry.json.class=org.apache.samza.serializers.JsonSerdeFactgory
+serializers.registry.json.class=org.apache.samza.serializers.JsonSerdeFactory
serializers.registry.string.class=org.apache.samza.serializers.StringSerdeFactory
serializers.registry.integer.class=org.apache.samza.serializers.IntegerSerdeFactory
http://git-wip-us.apache.org/repos/asf/samza-hello-samza/blob/01fb4569/src/main/java/samza/examples/wikipedia/application/WikipediaZkLocalApplication.java
----------------------------------------------------------------------
diff --git a/src/main/java/samza/examples/wikipedia/application/WikipediaZkLocalApplication.java b/src/main/java/samza/examples/wikipedia/application/WikipediaZkLocalApplication.java
index 8e978bc..51dd28f 100644
--- a/src/main/java/samza/examples/wikipedia/application/WikipediaZkLocalApplication.java
+++ b/src/main/java/samza/examples/wikipedia/application/WikipediaZkLocalApplication.java
@@ -32,11 +32,18 @@ import org.apache.samza.util.Util;
*/
public class WikipediaZkLocalApplication {
- public static void main(String[] args) throws Exception {
+ /**
+ * Executes the application using the local application runner.
+ * It takes two required command line arguments
+ * config-factory: a fully {@link org.apache.samza.config.factories.PropertiesConfigFactory} class name
+ * config-path: path to application properties
+ *
+ * @param args command line arguments
+ */
+ public static void main(String[] args) {
CommandLine cmdLine = new CommandLine();
OptionSet options = cmdLine.parser().parse(args);
- Config orgConfig = cmdLine.loadConfig(options);
- Config config = Util.rewriteConfig(orgConfig);
+ Config config = cmdLine.loadConfig(options);
LocalApplicationRunner runner = new LocalApplicationRunner(config);
WikipediaApplication app = new WikipediaApplication();