Repository: nifi Updated Branches: refs/heads/master 0229a5c10 -> 7cb39d636
NIFI-5696 Update references to default value for nifi.cluster.node.load.load.balance.port This closes #3071. Signed-off-by: Koji Kawamura <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/7cb39d63 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/7cb39d63 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/7cb39d63 Branch: refs/heads/master Commit: 7cb39d636c33289a1f93417c1750ef6173df348e Parents: 0229a5c Author: Jeff Storck <[email protected]> Authored: Fri Oct 12 16:57:15 2018 -0400 Committer: Koji Kawamura <[email protected]> Committed: Mon Oct 15 10:43:31 2018 +0900 ---------------------------------------------------------------------- .../java/org/apache/nifi/cluster/protocol/NodeIdentifier.java | 4 +++- .../nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/7cb39d63/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeIdentifier.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeIdentifier.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeIdentifier.java index 56f9a24..74c5538 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeIdentifier.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeIdentifier.java @@ -17,6 +17,7 @@ package org.apache.nifi.cluster.protocol; import org.apache.commons.lang3.StringUtils; +import org.apache.nifi.util.NiFiProperties; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -107,7 +108,8 @@ public class NodeIdentifier { public NodeIdentifier(final String id, final String apiAddress, final int apiPort, final String socketAddress, final int socketPort, final String siteToSiteAddress, final Integer siteToSitePort, final Integer siteToSiteHttpApiPort, final boolean siteToSiteSecure) { - this(id, apiAddress, apiPort, socketAddress, socketPort, socketAddress, 6342, siteToSiteAddress, siteToSitePort, siteToSiteHttpApiPort, siteToSiteSecure, null); + this(id, apiAddress, apiPort, socketAddress, socketPort, socketAddress, NiFiProperties.DEFAULT_LOAD_BALANCE_PORT, siteToSiteAddress, siteToSitePort, siteToSiteHttpApiPort, siteToSiteSecure, + null); } public NodeIdentifier(final String id, final String apiAddress, final int apiPort, final String socketAddress, final int socketPort, final String loadBalanceAddress, final int loadBalancePort, http://git-wip-us.apache.org/repos/asf/nifi/blob/7cb39d63/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml index c186e54..fc18be8 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml @@ -185,7 +185,7 @@ <!-- nifi.properties: cluster load balance properties --> <nifi.cluster.load.balance.host></nifi.cluster.load.balance.host> - <nifi.cluster.load.balance.port>7430</nifi.cluster.load.balance.port> + <nifi.cluster.load.balance.port>6342</nifi.cluster.load.balance.port> <nifi.cluster.load.balance.connections.per.node>4</nifi.cluster.load.balance.connections.per.node> <nifi.cluster.load.balance.max.thread.count>8</nifi.cluster.load.balance.max.thread.count> <nifi.cluster.load.balance.comms.timeout>30 sec</nifi.cluster.load.balance.comms.timeout>
