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 78E19200C3E for ; Tue, 21 Mar 2017 21:37:59 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 77835160B6E; Tue, 21 Mar 2017 20:37:59 +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 C4D52160B97 for ; Tue, 21 Mar 2017 21:37:58 +0100 (CET) Received: (qmail 64370 invoked by uid 500); 21 Mar 2017 20:37:58 -0000 Mailing-List: contact commits-help@flink.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.apache.org Delivered-To: mailing list commits@flink.apache.org Received: (qmail 64291 invoked by uid 99); 21 Mar 2017 20:37: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; Tue, 21 Mar 2017 20:37:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id ABF61DFF36; Tue, 21 Mar 2017 20:37:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sewen@apache.org To: commits@flink.apache.org Date: Tue, 21 Mar 2017 20:38:00 -0000 Message-Id: In-Reply-To: <808d2669a8d14674a70a00b3fcda4d8c@git.apache.org> References: <808d2669a8d14674a70a00b3fcda4d8c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/6] flink git commit: [hotfix] [config] Minor improvements to JobManagerOptions docs and harmonization of config parameters. archived-at: Tue, 21 Mar 2017 20:37:59 -0000 [hotfix] [config] Minor improvements to JobManagerOptions docs and harmonization of config parameters. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/81a143f6 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/81a143f6 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/81a143f6 Branch: refs/heads/master Commit: 81a143f6b42cf39d56a36222d14b5db0cc54addb Parents: e2ca129 Author: Stephan Ewen Authored: Tue Mar 21 19:46:51 2017 +0100 Committer: Stephan Ewen Committed: Tue Mar 21 21:37:21 2017 +0100 ---------------------------------------------------------------------- .../flink/configuration/JobManagerOptions.java | 32 +++++++++++++++----- 1 file changed, 25 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/81a143f6/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java b/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java index 2bc2498..6f5efe6 100644 --- a/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java +++ b/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java @@ -29,6 +29,12 @@ public class JobManagerOptions { /** * The config parameter defining the network address to connect to * for communication with the job manager. + * + *

This value is only interpreted in setups where a single JobManager with static + * name or address exists (simple standalone setups, or container setups with dynamic + * service name resolution). It is not used in many high-availability setups, when a + * leader-election service (like ZooKeeper) is used to elect and discover the JobManager + * leader from potentially multiple standby JobManagers. */ public static final ConfigOption ADDRESS = ConfigOptions .key("jobmanager.rpc.address") @@ -37,12 +43,31 @@ public class JobManagerOptions { /** * The config parameter defining the network port to connect to * for communication with the job manager. + * + *

Like {@link JobManagerOptions#ADDRESS}, this value is only interpreted in setups where + * a single JobManager with static name/address and port exists (simple standalone setups, + * or container setups with dynamic service name resolution). + * This config option is not used in many high-availability setups, when a + * leader-election service (like ZooKeeper) is used to elect and discover the JobManager + * leader from potentially multiple standby JobManagers. */ public static final ConfigOption PORT = ConfigOptions .key("jobmanager.rpc.port") .defaultValue(6123); /** + * The maximum number of prior execution attempts kept in history. + */ + public static final ConfigOption MAX_ATTEMPTS_HISTORY_SIZE = ConfigOptions + .key("jobmanager.execution.attempts-history-size") + .defaultValue(16) + .withDeprecatedKeys("job-manager.max-attempts-history-size"); + + // ------------------------------------------------------------------------ + // JobManager web UI + // ------------------------------------------------------------------------ + + /** * The port for the runtime monitor web-frontend server. */ public static final ConfigOption WEB_PORT = ConfigOptions @@ -127,13 +152,6 @@ public class JobManagerOptions { .key("jobmanager.web.backpressure.delay-between-samples") .defaultValue(50); - /** - * The maximum number of prior execution attempts kept in history. - */ - public static final ConfigOption MAX_ATTEMPTS_HISTORY_SIZE = ConfigOptions - .key("job-manager.max-attempts-history-size") - .defaultValue(16); - // --------------------------------------------------------------------------------------------- private JobManagerOptions() {