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 DA1B3200C21 for ; Mon, 20 Feb 2017 10:57:58 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id D8CD2160B7E; Mon, 20 Feb 2017 09:57:58 +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 383F9160B73 for ; Mon, 20 Feb 2017 10:57:58 +0100 (CET) Received: (qmail 81068 invoked by uid 500); 20 Feb 2017 09:57:57 -0000 Mailing-List: contact commits-help@beam.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@beam.apache.org Delivered-To: mailing list commits@beam.apache.org Received: (qmail 81007 invoked by uid 99); 20 Feb 2017 09:57:57 -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; Mon, 20 Feb 2017 09:57:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 439D8DFE1E; Mon, 20 Feb 2017 09:57:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: amitsela@apache.org To: commits@beam.apache.org Date: Mon, 20 Feb 2017 09:57:58 -0000 Message-Id: <6a168ae6edd74092840612175e28d83e@git.apache.org> In-Reply-To: <59f9a599f6974dfd8531f600bf25c3cc@git.apache.org> References: <59f9a599f6974dfd8531f600bf25c3cc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/9] beam git commit: Advance watermarks onBatchCompleted hook. archived-at: Mon, 20 Feb 2017 09:57:59 -0000 Advance watermarks onBatchCompleted hook. Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/fa31f18e Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/fa31f18e Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/fa31f18e Branch: refs/heads/master Commit: fa31f18e489d4cbe44fe4a9be7ba3d7dbee7c354 Parents: bbf3744 Author: Sela Authored: Sun Feb 12 18:31:14 2017 +0200 Committer: Sela Committed: Mon Feb 20 11:30:14 2017 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/beam/runners/spark/SparkRunner.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/fa31f18e/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkRunner.java ---------------------------------------------------------------------- diff --git a/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkRunner.java b/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkRunner.java index ebac375..52a080b 100644 --- a/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkRunner.java +++ b/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkRunner.java @@ -39,6 +39,7 @@ import org.apache.beam.runners.spark.translation.TransformEvaluator; import org.apache.beam.runners.spark.translation.TransformTranslator; import org.apache.beam.runners.spark.translation.streaming.Checkpoint.CheckpointDir; import org.apache.beam.runners.spark.translation.streaming.SparkRunnerStreamingContextFactory; +import org.apache.beam.runners.spark.util.GlobalWatermarkHolder.WatermarksListener; import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.io.Read; import org.apache.beam.sdk.metrics.MetricsEnvironment; @@ -191,12 +192,15 @@ public final class SparkRunner extends PipelineRunner { new JavaStreamingListenerWrapper( new MetricsAccumulator.AccumulatorCheckpointingSparkListener())); - // register listeners. + // register user-defined listeners. for (JavaStreamingListener listener: mOptions.as(SparkContextOptions.class).getListeners()) { LOG.info("Registered listener {}." + listener.getClass().getSimpleName()); jssc.addStreamingListener(new JavaStreamingListenerWrapper(listener)); } + // register Watermarks listener to broadcast the advanced WMs. + jssc.addStreamingListener(new JavaStreamingListenerWrapper(new WatermarksListener(jssc))); + startPipeline = executorService.submit(new Runnable() { @Override