Skip to content
Permalink
Browse files
Update fluo-parent to version 3 (#10)
* Update parent POM to fluo-parent version 3
* Apply formatter changes (usually would go in a separate commit, but
the changeset was small enough that it didn't matter here)
  • Loading branch information
ctubbsii authored and mikewalch committed Dec 5, 2017
1 parent 322e03f commit 058d17598e9d091c81ebd1eca9af2537f71eb0df
Showing 2 changed files with 8 additions and 9 deletions.
@@ -62,8 +62,8 @@ public TwillSpecification configure() {
.setInstances(env.getWorkerInstances()).build();

return TwillSpecification.Builder.with().setName("fluo-app-" + env.getApplicationName())
.withRunnable().add(ORACLE_ID, new BundledJarRunnable(), oracleResources)
.withLocalFiles().add(env.getBundledJarName(), new File(env.getBundledJarPath()), false)
.withRunnable().add(ORACLE_ID, new BundledJarRunnable(), oracleResources).withLocalFiles()
.add(env.getBundledJarName(), new File(env.getBundledJarPath()), false)
.add(CONN_PROPS, new File(env.getConnPropsPath()), false)
.add(LOG4J_PROPS, new File(env.getLogPropsPath()), false).apply()
.add(WORKER_ID, new BundledJarRunnable(), workerResources).withLocalFiles()
@@ -119,12 +119,11 @@ public static void main(String[] args) throws Exception {
new YarnTwillRunnerService(env.getYarnConfiguration(), env.getZookeepers());
twillRunner.start();

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());
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());

TwillController controller = preparer.start();

@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.fluo</groupId>
<artifactId>fluo-parent</artifactId>
<version>1-incubating</version>
<version>3</version>
</parent>
<artifactId>fluo-yarn-project</artifactId>
<version>1.0.0-SNAPSHOT</version>

0 comments on commit 058d175

Please sign in to comment.