(nifi) branch support/nifi-1.x updated: NIFI-12837 - Fix checkstyle issue following a manual cherrypick
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new f7cd8752ea NIFI-12837 - Fix checkstyle issue following a manual cherrypick f7cd8752ea is described below commit f7cd8752ea10f92281bf126e60c320e5d449c72a Author: Pierre Villard AuthorDate: Tue Apr 9 20:17:02 2024 +0200 NIFI-12837 - Fix checkstyle issue following a manual cherrypick --- .../test/java/org/apache/nifi/services/smb/SmbjClientServiceTest.java | 4 1 file changed, 4 deletions(-) diff --git a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-smbj-client/src/test/java/org/apache/nifi/services/smb/SmbjClientServiceTest.java b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-smbj-client/src/test/java/org/apache/nifi/services/smb/SmbjClientServiceTest.java index dba330fbc8..7193aad091 100644 --- a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-smbj-client/src/test/java/org/apache/nifi/services/smb/SmbjClientServiceTest.java +++ b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-smbj-client/src/test/java/org/apache/nifi/services/smb/SmbjClientServiceTest.java @@ -16,10 +16,6 @@ */ package org.apache.nifi.services.smb; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import com.hierynomus.smbj.session.Session; import com.hierynomus.smbj.share.DiskShare; import org.junit.jupiter.api.BeforeEach;
(nifi) branch support/nifi-1.x updated: NIFI-13010 Fix UpdateDatabaseTable to work with DBCPConnectionPoolLookup
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 8575bd52f9 NIFI-13010 Fix UpdateDatabaseTable to work with
DBCPConnectionPoolLookup
8575bd52f9 is described below
commit 8575bd52f9d7e47ca1cc6343d6cd17d8acb95c26
Author: Jim Steinebrey
AuthorDate: Tue Apr 9 10:57:45 2024 -0400
NIFI-13010 Fix UpdateDatabaseTable to work with DBCPConnectionPoolLookup
Signed-off-by: Pierre Villard
This closes #8616.
---
.../java/org/apache/nifi/processors/standard/UpdateDatabaseTable.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UpdateDatabaseTable.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UpdateDatabaseTable.java
index 32e73ae4c1..ecca771fd4 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UpdateDatabaseTable.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UpdateDatabaseTable.java
@@ -379,7 +379,7 @@ public class UpdateDatabaseTable extends AbstractProcessor {
}
final DBCPService dbcpService =
context.getProperty(DBCP_SERVICE).asControllerService(DBCPService.class);
final DatabaseAdapter databaseAdapter =
dbAdapters.get(context.getProperty(DB_TYPE).getValue());
-try (final Connection connection = dbcpService.getConnection()) {
+try (final Connection connection =
dbcpService.getConnection(flowFile.getAttributes())) {
final boolean quoteTableName =
context.getProperty(QUOTE_TABLE_IDENTIFIER).asBoolean();
final boolean quoteColumnNames =
context.getProperty(QUOTE_COLUMN_IDENTIFIERS).asBoolean();
final Map attributes = new
HashMap<>(flowFile.getAttributes());
(nifi) branch main updated: NIFI-13010 Fix UpdateDatabaseTable to work with DBCPConnectionPoolLookup
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new f15e6c73ec NIFI-13010 Fix UpdateDatabaseTable to work with
DBCPConnectionPoolLookup
f15e6c73ec is described below
commit f15e6c73ec9ed2b5155f8a29302aa94c48e9ebc9
Author: Jim Steinebrey
AuthorDate: Tue Apr 9 10:57:45 2024 -0400
NIFI-13010 Fix UpdateDatabaseTable to work with DBCPConnectionPoolLookup
Signed-off-by: Pierre Villard
This closes #8616.
---
.../java/org/apache/nifi/processors/standard/UpdateDatabaseTable.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UpdateDatabaseTable.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UpdateDatabaseTable.java
index 32e73ae4c1..ecca771fd4 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UpdateDatabaseTable.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UpdateDatabaseTable.java
@@ -379,7 +379,7 @@ public class UpdateDatabaseTable extends AbstractProcessor {
}
final DBCPService dbcpService =
context.getProperty(DBCP_SERVICE).asControllerService(DBCPService.class);
final DatabaseAdapter databaseAdapter =
dbAdapters.get(context.getProperty(DB_TYPE).getValue());
-try (final Connection connection = dbcpService.getConnection()) {
+try (final Connection connection =
dbcpService.getConnection(flowFile.getAttributes())) {
final boolean quoteTableName =
context.getProperty(QUOTE_TABLE_IDENTIFIER).asBoolean();
final boolean quoteColumnNames =
context.getProperty(QUOTE_COLUMN_IDENTIFIERS).asBoolean();
final Map attributes = new
HashMap<>(flowFile.getAttributes());
(nifi) branch main updated: NIFI-10977 Added documentation on Kubernetes Clustering
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/main by this push: new 858d0bdf25 NIFI-10977 Added documentation on Kubernetes Clustering 858d0bdf25 is described below commit 858d0bdf2556705279bb3e5c6ceb7c8bd60db21b Author: exceptionfactory AuthorDate: Sat Apr 6 22:34:40 2024 -0500 NIFI-10977 Added documentation on Kubernetes Clustering Signed-off-by: Pierre Villard This closes #8612. --- .../src/main/asciidoc/administration-guide.adoc| 118 - nifi-docs/src/main/asciidoc/images/ncm.png | Bin 89813 -> 0 bytes 2 files changed, 94 insertions(+), 24 deletions(-) diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc b/nifi-docs/src/main/asciidoc/administration-guide.adoc index e8efbb457c..fd5248948f 100644 --- a/nifi-docs/src/main/asciidoc/administration-guide.adoc +++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc @@ -2447,14 +2447,6 @@ configured in the _state-management.xml_ file. See <> for more ** `nifi.cluster.node.protocol.max.threads` - The maximum number of threads that should be used to communicate with other nodes in the cluster. This property defaults to `50`. A thread pool is used for replicating requests to all nodes. The thread pool will increase the number of active threads to the limit set by this property. It is typically recommended that this property be set to 4-8 times the number of nodes in your cluster. There could be up to `n+2` threads for a given request, where `n` = number of nodes in your cluster. As an example, if 4 requests are made, a 5 node cluster will use `4 * 7 = 28` threads. -** `nifi.zookeeper.connect.string` - The Connect String that is needed to connect to Apache ZooKeeper. This is a comma-separated list -of hostname:port pairs. For example, `localhost:2181,localhost:2182,localhost:2183`. This should contain a list of all ZooKeeper -instances in the ZooKeeper quorum. -** `nifi.zookeeper.root.node` - The root ZNode that should be used in ZooKeeper. ZooKeeper provides a directory-like structure -for storing data. Each 'directory' in this structure is referred to as a ZNode. This denotes the root ZNode, or 'directory', -that should be used for storing data. The default value is `/root`. This is important to set correctly, as which cluster -the NiFi instance attempts to join is determined by which ZooKeeper instance it connects to and the ZooKeeper Root Node -that is specified. ** `nifi.cluster.flow.election.max.wait.time` - Specifies the amount of time to wait before electing a Flow as the "correct" Flow. If the number of Nodes that have voted is equal to the number specified by the `nifi.cluster.flow.election.max.candidates` property, the cluster will not wait this long. The default value is `5 mins`. Note that the time starts as soon as the first vote @@ -2463,10 +2455,53 @@ is cast. of Flows. This allows the Nodes in the cluster to avoid having to wait a long time before starting processing if we reach at least this number of nodes in the cluster. -Now, it is possible to start up the cluster. It does not matter which order the instances start up. Navigate to the URL for -one of the nodes, and the User Interface should look similar to the following: +=== ZooKeeper Clustering + +The following application properties support clustering with Apache ZooKeeper: + +* `nifi.cluster.leader.election.implementation` + +The Leader Election Implementation must be set to `CuratorLeaderElectionManager` for clustering with Apache ZooKeeper. +The implementation defaults to ZooKeeper-based clustering when this property is not specified. + +* `nifi.zookeeper.connect.string` + +The Connect String that is needed to connect to Apache ZooKeeper. This is a comma-separated list +of hostname:port pairs. For example, `localhost:2181,localhost:2182,localhost:2183`. This should contain a list of all ZooKeeper +instances in the ZooKeeper quorum. + +* `nifi.zookeeper.root.node` + +The root ZNode that should be used in ZooKeeper. ZooKeeper provides a directory-like structure +for storing data. Each 'directory' in this structure is referred to as a ZNode. This denotes the root ZNode, or 'directory', +that should be used for storing data. The default value is `/root`. This is important to set correctly, as which cluster +the NiFi instance attempts to join is determined by which ZooKeeper instance it connects to and the ZooKeeper Root Node +that is specified. + +=== Kubernetes Clustering + +Kubernetes Clustering requires authorization to interact with Kubernetes Leases using +the following link:https://kubernetes.io/docs/reference/access-authn-authz/authorization/#determine-the-request-verb[API request verbs]: + +- `create` +- `get` +- `update` + +The following application properties support clustering with Kuber
(nifi) branch support/nifi-1.x updated: NIFI-12837 Added DFS support in SMB processors
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 10ce00862d NIFI-12837 Added DFS support in SMB processors
10ce00862d is described below
commit 10ce00862d1479dee1444d0da9cc48bbbd83729f
Author: Peter Turcsanyi
AuthorDate: Mon Mar 18 11:04:32 2024 +0100
NIFI-12837 Added DFS support in SMB processors
Signed-off-by: Pierre Villard
This closes #8527.
---
.../org/apache/nifi/processors/smb/GetSmbFile.java | 2 +
.../org/apache/nifi/processors/smb/PutSmbFile.java | 2 +
.../org/apache/nifi/processors/smb/SmbDfsIT.java | 229 +
.../services/smb/SmbjClientProviderService.java| 83 +++-
...iSmbjClientIT.java => SmbjClientServiceIT.java} | 4 +-
...jClientTest.java => SmbjClientServiceTest.java} | 8 +-
.../java/org/apache/nifi/smb/common/SmbClient.java | 92 +
.../org/apache/nifi/smb/common/SmbProperties.java | 9 +
.../java/org/apache/nifi/smb/common/SmbUtils.java | 7 +-
9 files changed, 376 insertions(+), 60 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java
index ed843f9bff..f1649a4faa 100644
---
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java
+++
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java
@@ -80,6 +80,7 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import java.util.regex.Pattern;
+import static org.apache.nifi.smb.common.SmbProperties.ENABLE_DFS;
import static org.apache.nifi.smb.common.SmbProperties.SMB_DIALECT;
import static org.apache.nifi.smb.common.SmbProperties.TIMEOUT;
import static org.apache.nifi.smb.common.SmbProperties.USE_ENCRYPTION;
@@ -257,6 +258,7 @@ public class GetSmbFile extends AbstractProcessor {
descriptors.add(IGNORE_HIDDEN_FILES);
descriptors.add(SMB_DIALECT);
descriptors.add(USE_ENCRYPTION);
+descriptors.add(ENABLE_DFS);
descriptors.add(TIMEOUT);
this.descriptors = Collections.unmodifiableList(descriptors);
diff --git
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/PutSmbFile.java
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/PutSmbFile.java
index 468828f819..af2eab2ff1 100644
---
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/PutSmbFile.java
+++
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/PutSmbFile.java
@@ -64,6 +64,7 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeUnit;
+import static org.apache.nifi.smb.common.SmbProperties.ENABLE_DFS;
import static org.apache.nifi.smb.common.SmbProperties.SMB_DIALECT;
import static org.apache.nifi.smb.common.SmbProperties.TIMEOUT;
import static org.apache.nifi.smb.common.SmbProperties.USE_ENCRYPTION;
@@ -194,6 +195,7 @@ public class PutSmbFile extends AbstractProcessor {
descriptors.add(RENAME_SUFFIX);
descriptors.add(SMB_DIALECT);
descriptors.add(USE_ENCRYPTION);
+descriptors.add(ENABLE_DFS);
descriptors.add(TIMEOUT);
this.descriptors = Collections.unmodifiableList(descriptors);
diff --git
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/test/java/org/apache/nifi/processors/smb/SmbDfsIT.java
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/test/java/org/apache/nifi/processors/smb/SmbDfsIT.java
new file mode 100644
index 00..6fe51b3eb6
--- /dev/null
+++
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/test/java/org/apache/nifi/processors/smb/SmbDfsIT.java
@@ -0,0 +1,229 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations
(nifi) branch main updated: NIFI-12837 Added DFS support in SMB processors
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 928206d52f NIFI-12837 Added DFS support in SMB processors
928206d52f is described below
commit 928206d52f3a442b24eb5a911507af821c30ea2d
Author: Peter Turcsanyi
AuthorDate: Mon Mar 18 11:04:32 2024 +0100
NIFI-12837 Added DFS support in SMB processors
Signed-off-by: Pierre Villard
This closes #8527.
---
.../org/apache/nifi/processors/smb/GetSmbFile.java | 2 +
.../org/apache/nifi/processors/smb/PutSmbFile.java | 2 +
.../org/apache/nifi/processors/smb/SmbDfsIT.java | 225 +
.../services/smb/SmbjClientProviderService.java| 83 +++-
...iSmbjClientIT.java => SmbjClientServiceIT.java} | 4 +-
...jClientTest.java => SmbjClientServiceTest.java} | 2 +-
.../java/org/apache/nifi/smb/common/SmbClient.java | 92 +
.../org/apache/nifi/smb/common/SmbProperties.java | 9 +
.../java/org/apache/nifi/smb/common/SmbUtils.java | 7 +-
9 files changed, 367 insertions(+), 59 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java
index b4089f5287..e1e1d5250d 100644
---
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java
+++
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java
@@ -80,6 +80,7 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import java.util.regex.Pattern;
+import static org.apache.nifi.smb.common.SmbProperties.ENABLE_DFS;
import static org.apache.nifi.smb.common.SmbProperties.SMB_DIALECT;
import static org.apache.nifi.smb.common.SmbProperties.TIMEOUT;
import static org.apache.nifi.smb.common.SmbProperties.USE_ENCRYPTION;
@@ -257,6 +258,7 @@ public class GetSmbFile extends AbstractProcessor {
descriptors.add(IGNORE_HIDDEN_FILES);
descriptors.add(SMB_DIALECT);
descriptors.add(USE_ENCRYPTION);
+descriptors.add(ENABLE_DFS);
descriptors.add(TIMEOUT);
this.descriptors = Collections.unmodifiableList(descriptors);
diff --git
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/PutSmbFile.java
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/PutSmbFile.java
index 468828f819..af2eab2ff1 100644
---
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/PutSmbFile.java
+++
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/PutSmbFile.java
@@ -64,6 +64,7 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeUnit;
+import static org.apache.nifi.smb.common.SmbProperties.ENABLE_DFS;
import static org.apache.nifi.smb.common.SmbProperties.SMB_DIALECT;
import static org.apache.nifi.smb.common.SmbProperties.TIMEOUT;
import static org.apache.nifi.smb.common.SmbProperties.USE_ENCRYPTION;
@@ -194,6 +195,7 @@ public class PutSmbFile extends AbstractProcessor {
descriptors.add(RENAME_SUFFIX);
descriptors.add(SMB_DIALECT);
descriptors.add(USE_ENCRYPTION);
+descriptors.add(ENABLE_DFS);
descriptors.add(TIMEOUT);
this.descriptors = Collections.unmodifiableList(descriptors);
diff --git
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/test/java/org/apache/nifi/processors/smb/SmbDfsIT.java
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/test/java/org/apache/nifi/processors/smb/SmbDfsIT.java
new file mode 100644
index 00..d8076955bc
--- /dev/null
+++
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/test/java/org/apache/nifi/processors/smb/SmbDfsIT.java
@@ -0,0 +1,225 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
(nifi) branch main updated: NIFI-12889 - Retry Kerberos login on auth failure in HDFS processors
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 06b0f29cad NIFI-12889 - Retry Kerberos login on auth failure in HDFS
processors
06b0f29cad is described below
commit 06b0f29cad352922fbed16decabe33246a2ddc0b
Author: Matt Burgess
AuthorDate: Fri Mar 22 18:39:48 2024 -0400
NIFI-12889 - Retry Kerberos login on auth failure in HDFS processors
---
.../processors/hadoop/AbstractHadoopProcessor.java | 46 +++-
.../apache/nifi/processors/hadoop/DeleteHDFS.java | 33 ++-
.../apache/nifi/processors/hadoop/FetchHDFS.java | 100
.../org/apache/nifi/processors/hadoop/GetHDFS.java | 21 +-
.../nifi/processors/hadoop/GetHDFSFileInfo.java| 16 +-
.../processors/hadoop/GetHDFSSequenceFile.java | 19 +-
.../apache/nifi/processors/hadoop/MoveHDFS.java| 180 +++---
.../org/apache/nifi/processors/hadoop/PutHDFS.java | 128 --
.../GSSExceptionRollbackYieldSessionHandler.java | 30 +++
.../processors/hadoop/GetHDFSSequenceFileTest.java | 57 -
.../apache/nifi/processors/hadoop/GetHDFSTest.java | 41 +++-
.../nifi/processors/hadoop/MoveHDFSTest.java | 62 -
.../apache/nifi/processors/hadoop/PutHDFSTest.java | 191 +++---
.../nifi/processors/hadoop/TestDeleteHDFS.java | 20 +-
.../nifi/processors/hadoop/TestFetchHDFS.java | 62 +++--
.../processors/hadoop/TestGetHDFSFileInfo.java | 164 ++---
.../processors/hadoop/util/MockFileSystem.java | 273 +
17 files changed, 846 insertions(+), 597 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
b/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
index 447f198226..362c1be7af 100644
---
a/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
+++
b/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.processors.hadoop;
+import com.google.common.base.Throwables;
import org.apache.commons.io.IOUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
@@ -42,11 +43,13 @@ import org.apache.nifi.kerberos.KerberosCredentialsService;
import org.apache.nifi.kerberos.KerberosUserService;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
+import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.ProcessorInitializationContext;
import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.security.krb.KerberosKeytabUser;
import org.apache.nifi.security.krb.KerberosPasswordUser;
import org.apache.nifi.security.krb.KerberosUser;
+import org.ietf.jgss.GSSException;
import javax.net.SocketFactory;
import java.io.File;
@@ -62,7 +65,10 @@ import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BiConsumer;
+import java.util.function.Predicate;
import java.util.regex.Pattern;
+import java.util.stream.Stream;
/**
* This is a base class that is helpful when building processors interacting
with HDFS.
@@ -171,7 +177,7 @@ public abstract class AbstractHadoopProcessor extends
AbstractProcessor implemen
// variables shared by all threads of this processor
// Hadoop Configuration, Filesystem, and UserGroupInformation (optional)
-private final AtomicReference hdfsResources = new
AtomicReference<>();
+final AtomicReference hdfsResources = new
AtomicReference<>();
// Holder of cached Configuration information so validation does not
reload the same config over and over
private final AtomicReference
validationResourceHolder = new AtomicReference<>();
@@ -532,12 +538,7 @@ public abstract class AbstractHadoopProcessor extends
AbstractProcessor implemen
protected FileSystem getFileSystemAsUser(final Configuration config,
UserGroupInformation ugi) throws IOException {
try {
-return ugi.doAs(new PrivilegedExceptionAction() {
-@Override
-public FileSystem run() throws Exception {
-return FileSystem.get(config);
-}
-});
+return ugi.doAs((PrivilegedExceptionAction) () ->
FileSystem.get(config));
} catch (InterruptedException e) {
throw new IOException("Unable to create file system: " +
e.getMessage());
}
@@ -703,4 +704,35 @@ public abstract class AbstractHadoopProcessor ex
(nifi) branch main updated: NIFI-13014 Remove unused Avatica versions from code-coverage
This is an automated email from the ASF dual-hosted git repository.
turcsanyi pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 63fc1aeceb NIFI-13014 Remove unused Avatica versions from code-coverage
63fc1aeceb is described below
commit 63fc1aecebd6bff7478f102b6fcc489d8018bebe
Author: exceptionfactory
AuthorDate: Mon Apr 8 20:07:00 2024 -0500
NIFI-13014 Remove unused Avatica versions from code-coverage
This closes #8615.
Signed-off-by: Peter Turcsanyi
---
nifi-code-coverage/pom.xml | 13 -
1 file changed, 13 deletions(-)
diff --git a/nifi-code-coverage/pom.xml b/nifi-code-coverage/pom.xml
index 66e72afb3f..4d54c0fd59 100644
--- a/nifi-code-coverage/pom.xml
+++ b/nifi-code-coverage/pom.xml
@@ -28,8 +28,6 @@
1.10.14
-1.6.0
-1.24.0
2.12.0
0.8.11
@@ -64,17 +62,6 @@
ant-antlr
${ant.version}
-
-
-org.apache.calcite
-calcite-avatica
-${calcite.avatica.version}
-
-
-org.apache.calcite.avatica
-avatica
-${avatica.version}
-
org.codehaus.janino
