From ada0baf15a714f7f4817a7aa8f102fb9fb2e718c Mon Sep 17 00:00:00 2001 From: Olivier Charuel Date: Wed, 20 Dec 2023 16:49:09 +0100 Subject: [PATCH] Allow to customize cluster and zookeeper timeout settings (#323) Signed-off-by: Olivier Charuel --- Chart.yaml | 2 +- README.md | 4 ++++ configs/nifi.properties | 8 ++++---- values.yaml | 4 ++++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index 39de58bc..535998ab 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,7 +1,7 @@ --- apiVersion: v2 name: nifi -version: 1.1.6 +version: 1.2.0 appVersion: 1.23.2 description: Apache NiFi is a software project from the Apache Software Foundation designed to automate the flow of data between software systems. keywords: diff --git a/README.md b/README.md index fcbfa61f..d438658a 100644 --- a/README.md +++ b/README.md @@ -128,6 +128,10 @@ The following table lists the configurable parameters of the nifi chart and the | `properties.httpPort` | web properties HTTP port | `8080` | | `properties.httpsPort` | web properties HTTPS port | `null` | | `properties.clusterPort` | cluster node port | `6007` | +| `properties.clusterNodeConnectionTimeout` | cluster node connection timeout | `5 sec` | +| `properties.clusterNodeReadTimeout` | cluster node read timeout | `5 sec` | +| `properties.zookeeperConnectTimeout` | zookeeper connect timeout | `3 secs` | +| `properties.zookeeperSessionTimeout` | zookeeper session timeout | `3 secs` | | `properties.archiveMaxRetentionPeriod` | nifi content repository archive max retention period | `3 days` | | `properties.archiveMaxUsagePercentage` | nifi content repository archive max usage | `85%` | | `properties.provenanceStorage` | nifi provenance repository max storage size | `8 GB` | diff --git a/configs/nifi.properties b/configs/nifi.properties index 7a5996f2..5a0d67fd 100644 --- a/configs/nifi.properties +++ b/configs/nifi.properties @@ -230,8 +230,8 @@ nifi.cluster.node.protocol.port={{.Values.properties.clusterPort}} nifi.cluster.node.protocol.threads=10 nifi.cluster.node.protocol.max.threads=50 nifi.cluster.node.event.history.size=25 -nifi.cluster.node.connection.timeout=5 sec -nifi.cluster.node.read.timeout=5 sec +nifi.cluster.node.connection.timeout={{.Values.properties.clusterNodeConnectionTimeout}} +nifi.cluster.node.read.timeout={{.Values.properties.clusterNodeReadTimeout}} nifi.cluster.node.max.concurrent.requests=100 nifi.cluster.firewall.file= nifi.cluster.flow.election.max.wait.time=1 mins @@ -240,8 +240,8 @@ nifi.cluster.flow.election.max.candidates= # zookeeper properties, used for cluster management # nifi.zookeeper.client.ensembleTracker={{.Values.properties.zkClientEnsembleTraker}} nifi.zookeeper.connect.string= -nifi.zookeeper.connect.timeout=3 secs -nifi.zookeeper.session.timeout=3 secs +nifi.zookeeper.connect.timeout={{.Values.properties.zookeeperConnectTimeout}} +nifi.zookeeper.session.timeout={{.Values.properties.zookeeperSessionTimeout}} nifi.zookeeper.root.node=/nifi # Zookeeper properties for the authentication scheme used when creating acls on znodes used for cluster management diff --git a/values.yaml b/values.yaml index ea562490..e58c2a1c 100644 --- a/values.yaml +++ b/values.yaml @@ -95,6 +95,10 @@ properties: webProxyHost: # : (If Nifi service is NodePort or LoadBalancer) clusterPort: 6007 zkClientEnsembleTraker: false # https://issues.apache.org/jira/browse/NIFI-10481 + clusterNodeConnectionTimeout: '5 sec' + clusterNodeReadTimeout: '5 sec' + zookeeperConnectTimeout: '3 secs' + zookeeperSessionTimeout: '3 secs' archiveMaxRetentionPeriod: "3 days" archiveMaxUsagePercentage: "85%" provenanceStorage: "8 GB"