Fixes due upstream changes in Fluo (#9)

* Fixes due to changes in Fluo command line
apache · Oct 6, 2017 · 322e03f · 322e03f
1 parent 34eaab8
commit 322e03f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/core/src/main/java/org/apache/fluo/yarn/core/FluoYarnLauncher.java b/core/src/main/java/org/apache/fluo/yarn/core/FluoYarnLauncher.java
@@ -108,12 +108,12 @@ public static void main(String[] args) throws Exception {
     BundledJarRunner.Arguments oracleArgs =
         new BundledJarRunner.Arguments.Builder().setJarFileName(env.getBundledJarName())
             .setLibFolder("lib").setMainClassName("org.apache.fluo.command.FluoOracle")
-            .setMainArgs(new String[] {CONN_PROPS, appName}).createArguments();
+            .setMainArgs(new String[] {"-a", appName}).createArguments();
 
     BundledJarRunner.Arguments workerArgs =
         new BundledJarRunner.Arguments.Builder().setJarFileName(env.getBundledJarName())
             .setLibFolder("lib").setMainClassName("org.apache.fluo.command.FluoWorker")
-            .setMainArgs(new String[] {CONN_PROPS, appName}).createArguments();
+            .setMainArgs(new String[] {"-a", appName}).createArguments();
 
     TwillRunnerService twillRunner =
         new YarnTwillRunnerService(env.getYarnConfiguration(), env.getZookeepers());
@@ -122,6 +122,7 @@ public static void main(String[] args) throws Exception {
     TwillPreparer preparer =
         twillRunner.prepare(new FluoYarnApp(env))
             .addJVMOptions("-Dlog4j.configuration=file:$PWD/" + LOG4J_PROPS)
+            .addJVMOptions(("-Dfluo.conn.props=" + CONN_PROPS))
             .withArguments(ORACLE_ID, oracleArgs.toArray())
             .withArguments(WORKER_ID, workerArgs.toArray());
 

diff --git a/distribution/bin/fluo-yarn b/distribution/bin/fluo-yarn
@@ -53,7 +53,7 @@ function print_usage {
 function build_bundled_jar {
   app_dir=$lib/apps/$app
   mkdir -p "$app_dir/lib"
-  $FLUO_HOME/bin/fluo get-jars "$app" "$app_dir/lib"
+  $FLUO_HOME/bin/fluo get-jars -a "$app" -d "$app_dir/lib"
 
   fluo_classpath=$FLUO_CLASSPATH
 
@@ -88,7 +88,7 @@ start)
     print_usage
     exit 1
   fi
-  app_status=$($FLUO_HOME/bin/fluo status $app)
+  app_status=$($FLUO_HOME/bin/fluo status -a $app)
   if [[ "$app_status" == "RUNNING" ]]; then
     echo "Fluo appplication '$app' is already running!"
     exit 1