Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5D02C200B45 for ; Fri, 1 Jul 2016 05:14:11 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5B877160A52; Fri, 1 Jul 2016 03:14:11 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A582C160A63 for ; Fri, 1 Jul 2016 05:14:10 +0200 (CEST) Received: (qmail 1076 invoked by uid 500); 1 Jul 2016 03:14:09 -0000 Mailing-List: contact commits-help@fluo.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@fluo.incubator.apache.org Delivered-To: mailing list commits@fluo.incubator.apache.org Received: (qmail 1061 invoked by uid 99); 1 Jul 2016 03:14:09 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Jul 2016 03:14:09 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 62A4F1A03BF for ; Fri, 1 Jul 2016 03:14:09 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id tAYeg6z5ZbKX for ; Fri, 1 Jul 2016 03:14:05 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 3BC565F4EA for ; Fri, 1 Jul 2016 03:14:04 +0000 (UTC) Received: (qmail 926 invoked by uid 99); 1 Jul 2016 03:14:03 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Jul 2016 03:14:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2F2EFE00DB; Fri, 1 Jul 2016 03:14:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kturner@apache.org To: commits@fluo.incubator.apache.org Date: Fri, 01 Jul 2016 03:14:04 -0000 Message-Id: <25dfcca4a94a42fb95536310b1bd6f62@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/5] incubator-fluo git commit: #683 - Stopped creating Oracle & Worker using FluoFactory so Twill can find dependencies archived-at: Fri, 01 Jul 2016 03:14:11 -0000 #683 - Stopped creating Oracle & Worker using FluoFactory so Twill can find dependencies Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo/commit/7547863c Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo/tree/7547863c Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo/diff/7547863c Branch: refs/heads/master Commit: 7547863cdd6e531c28ee009d9bdcad529b034780 Parents: 28b9f2f Author: Mike Walch Authored: Tue Jun 28 16:47:47 2016 -0400 Committer: Mike Walch Committed: Tue Jun 28 16:54:20 2016 -0400 ---------------------------------------------------------------------- .../java/org/apache/fluo/cluster/runnable/OracleRunnable.java | 5 ++++- .../java/org/apache/fluo/cluster/runnable/WorkerRunnable.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/7547863c/modules/cluster/src/main/java/org/apache/fluo/cluster/runnable/OracleRunnable.java ---------------------------------------------------------------------- diff --git a/modules/cluster/src/main/java/org/apache/fluo/cluster/runnable/OracleRunnable.java b/modules/cluster/src/main/java/org/apache/fluo/cluster/runnable/OracleRunnable.java index e4f2cea..5080037 100644 --- a/modules/cluster/src/main/java/org/apache/fluo/cluster/runnable/OracleRunnable.java +++ b/modules/cluster/src/main/java/org/apache/fluo/cluster/runnable/OracleRunnable.java @@ -24,6 +24,7 @@ import org.apache.fluo.api.config.FluoConfiguration; import org.apache.fluo.api.service.FluoOracle; import org.apache.fluo.cluster.util.LogbackUtil; import org.apache.fluo.core.metrics.MetricNames; +import org.apache.fluo.core.oracle.FluoOracleImpl; import org.apache.fluo.core.util.UtilWaitThread; import org.apache.twill.api.AbstractTwillRunnable; import org.apache.twill.api.TwillContext; @@ -76,7 +77,9 @@ public class OracleRunnable extends AbstractTwillRunnable { System.setProperty(MetricNames.METRICS_ID_PROP, "oracle-" + context.getInstanceId()); } - FluoOracle oracle = FluoFactory.newOracle(config); + // FluoFactory cannot be used to create FluoOracle as Twill will not load its dependencies + // if it is loaded dynamically + FluoOracle oracle = new FluoOracleImpl(config); oracle.start(); while (!shutdown.get()) { UtilWaitThread.sleep(10000); http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/7547863c/modules/cluster/src/main/java/org/apache/fluo/cluster/runnable/WorkerRunnable.java ---------------------------------------------------------------------- diff --git a/modules/cluster/src/main/java/org/apache/fluo/cluster/runnable/WorkerRunnable.java b/modules/cluster/src/main/java/org/apache/fluo/cluster/runnable/WorkerRunnable.java index f7fdbb9..9b7e6b7 100644 --- a/modules/cluster/src/main/java/org/apache/fluo/cluster/runnable/WorkerRunnable.java +++ b/modules/cluster/src/main/java/org/apache/fluo/cluster/runnable/WorkerRunnable.java @@ -25,6 +25,7 @@ import org.apache.fluo.api.service.FluoWorker; import org.apache.fluo.cluster.util.LogbackUtil; import org.apache.fluo.core.metrics.MetricNames; import org.apache.fluo.core.util.UtilWaitThread; +import org.apache.fluo.core.worker.FluoWorkerImpl; import org.apache.twill.api.AbstractTwillRunnable; import org.apache.twill.api.TwillContext; import org.slf4j.Logger; @@ -90,7 +91,9 @@ public class WorkerRunnable extends AbstractTwillRunnable { System.setProperty(MetricNames.METRICS_ID_PROP, "worker-" + context.getInstanceId()); } - FluoWorker worker = FluoFactory.newWorker(config); + // FluoFactory cannot be used to create FluoWorker as Twill will not load its dependencies + // if it is loaded dynamically + FluoWorker worker = new FluoWorkerImpl(config); worker.start(); while (!shutdown.get()) { UtilWaitThread.sleep(1000);