Fixes due upstream changes in Fluo (#9)
* Fixes due to changes in Fluo command line
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
index 7da612e..838bd13 100644
--- 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 @@
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 @@
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
index 5c78307..e719380 100755
--- a/distribution/bin/fluo-yarn
+++ b/distribution/bin/fluo-yarn
@@ -53,7 +53,7 @@
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 @@
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