This is an automated email from the ASF dual-hosted git repository.
mthomsen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push:
new 60b00a1 NIFI-2738 Removed references to
nifi.cluster.request.replication.claim.timeout
60b00a1 is described below
commit 60b00a1e38682d9cf79d6a5d1adbaa185df1ccaa
Author: Jan Hentschel <[email protected]>
AuthorDate: Sun Jul 8 18:26:11 2018 +0200
NIFI-2738 Removed references to
nifi.cluster.request.replication.claim.timeout
This closes #2860
Signed-off-by: Mike Thomsen <[email protected]>
---
nifi-docs/src/main/asciidoc/administration-guide.adoc | 9 +--------
.../nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml | 2 --
.../src/test/resources/NiFiProperties/conf/nifi.properties | 3 ---
.../conf/nifi_with_sensitive_properties_protected_aes.properties | 3 ---
.../nifi_with_sensitive_properties_protected_aes_128.properties | 3 ---
...h_sensitive_properties_protected_aes_different_key.properties | 3 ---
...nsitive_properties_protected_aes_different_key_128.properties | 3 ---
.../nifi-web-api/src/test/resources/site-to-site/nifi.properties | 3 ---
.../src/test/resources/localhost/nifi.properties | 3 ---
9 files changed, 1 insertion(+), 31 deletions(-)
diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc
b/nifi-docs/src/main/asciidoc/administration-guide.adoc
index 0244cfa..1effe14 100644
--- a/nifi-docs/src/main/asciidoc/administration-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc
@@ -3130,14 +3130,7 @@ is allowed, the node from which the request originated
must decide whether or no
all vote 'YES' then the request is completed. In this sort of distributed
environment, it is possible that the node that
made the original request will fail after the voting has occurred and before
the request was completed. This would leave
the component locked indefinitely so that no more changes can be made to the
component. In order to avoid this, the Claim
-will time out after some period of time. These properties determines how these
locks are managed.
-
-|====
-|*Property*|*Description*
-|`nifi.cluster.request.replication.claim.timeout`|Specifies how long to wait
before considering a lock 'expired' and automatically
-unlocking.
-|====
-
+will time out after some period of time.
=== ZooKeeper Properties
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 a9b2fe4..9301d9c 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
@@ -190,8 +190,6 @@
<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>
- <nifi.cluster.request.replication.claim.timeout>15
secs</nifi.cluster.request.replication.claim.timeout>
-
<!-- nifi.properties: zookeeper properties -->
<nifi.zookeeper.connect.string />
<nifi.zookeeper.connect.timeout>3 secs</nifi.zookeeper.connect.timeout>
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/src/test/resources/NiFiProperties/conf/nifi.properties
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/src/test/resources/NiFiProperties/conf/nifi.properties
index 5b16076..5e50e1b 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/src/test/resources/NiFiProperties/conf/nifi.properties
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/src/test/resources/NiFiProperties/conf/nifi.properties
@@ -170,9 +170,6 @@ nifi.cluster.node.connection.timeout=5 sec
nifi.cluster.node.read.timeout=5 sec
nifi.cluster.firewall.file=
-# How long a request should be allowed to hold a 'lock' on a component. #
-nifi.cluster.request.replication.claim.timeout=15 secs
-
# zookeeper properties, used for cluster management #
nifi.zookeeper.connect.string=
nifi.zookeeper.connect.timeout=3 secs
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/src/test/resources/NiFiProperties/conf/nifi_with_sensitive_properties_protected_aes.properties
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/src/test/resources/NiFiProperties/conf/nifi_with_sensitive_properties_protected_aes.properties
index a018d45..c269f4e 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/src/test/resources/NiFiProperties/conf/nifi_with_sensitive_properties_protected_aes.properties
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/src/test/resources/NiFiProperties/conf/nifi_with_sensitive_properties_protected_aes.properties
@@ -171,9 +171,6 @@ nifi.cluster.node.connection.timeout=5 sec
nifi.cluster.node.read.timeout=5 sec
nifi.cluster.firewall.file=
-# How long a request should be allowed to hold a 'lock' on a component. #
-nifi.cluster.request.replication.claim.timeout=15 secs
-
# zookeeper properties, used for cluster management #
nifi.zookeeper.connect.string=
nifi.zookeeper.connect.timeout=3 secs
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/src/test/resources/NiFiProperties/conf/nifi_with_sensitive_properties_protected_aes_128.properties
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/src/test/resources/NiFiProperties/conf/nifi_with_sensitive_properties_protected_aes_128.properties
index 37fba57..9b52944 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/src/test/resources/NiFiProperties/conf/nifi_with_sensitive_properties_protected_aes_128.properties
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/src/test/resources/NiFiProperties/conf/nifi_with_sensitive_properties_protected_aes_128.properties
@@ -171,9 +171,6 @@ nifi.cluster.node.connection.timeout=5 sec
nifi.cluster.node.read.timeout=5 sec
nifi.cluster.firewall.file=
-# How long a request should be allowed to hold a 'lock' on a component. #
-nifi.cluster.request.replication.claim.timeout=15 secs
-
# zookeeper properties, used for cluster management #
nifi.zookeeper.connect.string=
nifi.zookeeper.connect.timeout=3 secs
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/src/test/resources/NiFiProperties/conf/nifi_with_sensitive_properties_protected_aes_different_key.properties
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/src/test/resources/NiFiProperties/conf/nifi_with_sensitive_properties_protected_aes_different_key.properties
index 39a1d4a..a89a5db 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/src/test/resources/NiFiProperties/conf/nifi_with_sensitive_properties_protected_aes_different_key.properties
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/src/test/resources/NiFiProperties/conf/nifi_with_sensitive_properties_protected_aes_different_key.properties
@@ -174,9 +174,6 @@ nifi.cluster.node.connection.timeout=5 sec
nifi.cluster.node.read.timeout=5 sec
nifi.cluster.firewall.file=
-# How long a request should be allowed to hold a 'lock' on a component. #
-nifi.cluster.request.replication.claim.timeout=15 secs
-
# zookeeper properties, used for cluster management #
nifi.zookeeper.connect.string=
nifi.zookeeper.connect.timeout=3 secs
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/src/test/resources/NiFiProperties/conf/nifi_with_sensitive_properties_protected_aes_different_key_128.properties
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/src/test/resources/NiFiProperties/conf/nifi_with_sensitive_properties_protected_aes_different_key_128.properties
index 84a613c..2d012af 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/src/test/resources/NiFiProperties/conf/nifi_with_sensitive_properties_protected_aes_different_key_128.properties
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/src/test/resources/NiFiProperties/conf/nifi_with_sensitive_properties_protected_aes_different_key_128.properties
@@ -174,9 +174,6 @@ nifi.cluster.node.connection.timeout=5 sec
nifi.cluster.node.read.timeout=5 sec
nifi.cluster.firewall.file=
-# How long a request should be allowed to hold a 'lock' on a component. #
-nifi.cluster.request.replication.claim.timeout=15 secs
-
# zookeeper properties, used for cluster management #
nifi.zookeeper.connect.string=
nifi.zookeeper.connect.timeout=3 secs
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/site-to-site/nifi.properties
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/site-to-site/nifi.properties
index b612c55..89e62c0 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/site-to-site/nifi.properties
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/site-to-site/nifi.properties
@@ -156,9 +156,6 @@
nifi.cluster.node.connection.timeout=${nifi.cluster.node.connection.timeout}
nifi.cluster.node.read.timeout=${nifi.cluster.node.read.timeout}
nifi.cluster.firewall.file=${nifi.cluster.firewall.file}
-# How long a request should be allowed to hold a 'lock' on a component. #
-nifi.cluster.request.replication.claim.timeout=${nifi.cluster.request.replication.claim.timeout}
-
# zookeeper properties, used for cluster management #
nifi.zookeeper.connect.string=${nifi.zookeeper.connect.string}
nifi.zookeeper.connect.timeout=${nifi.zookeeper.connect.timeout}
diff --git
a/nifi-toolkit/nifi-toolkit-tls/src/test/resources/localhost/nifi.properties
b/nifi-toolkit/nifi-toolkit-tls/src/test/resources/localhost/nifi.properties
index 2eedb04..852848b 100644
--- a/nifi-toolkit/nifi-toolkit-tls/src/test/resources/localhost/nifi.properties
+++ b/nifi-toolkit/nifi-toolkit-tls/src/test/resources/localhost/nifi.properties
@@ -159,9 +159,6 @@ nifi.cluster.node.connection.timeout=5 sec
nifi.cluster.node.read.timeout=5 sec
nifi.cluster.firewall.file=
-# How long a request should be allowed to hold a 'lock' on a component. #
-nifi.cluster.request.replication.claim.timeout=15 secs
-
# zookeeper properties, used for cluster management #
nifi.zookeeper.connect.string=
nifi.zookeeper.connect.timeout=3 secs
