(nifi) branch main updated: NIFI-12966 Upgraded Netty from 4.1.106 to 4.1.108
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 8ef9528bf9 NIFI-12966 Upgraded Netty from 4.1.106 to 4.1.108 8ef9528bf9 is described below commit 8ef9528bf9685b0cdbfa900eb688741d205db770 Author: exceptionfactory AuthorDate: Wed Mar 27 21:22:04 2024 -0500 NIFI-12966 Upgraded Netty from 4.1.106 to 4.1.108 Signed-off-by: Pierre Villard This closes #8578. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8a90650423..eeecb4e52c 100644 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ 5.8.0 3.10.6.Final 2.2 -4.1.106.Final +4.1.108.Final 6.0.0 6.1.5 6.2.3
(nifi-minifi-cpp) branch main updated: MINIFICPP-2230 MergeContent should yield if no ready bins and no incoming flowfiles
This is an automated email from the ASF dual-hosted git repository.
lordgamez pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/main by this push:
new be51e246c MINIFICPP-2230 MergeContent should yield if no ready bins
and no incoming flowfiles
be51e246c is described below
commit be51e246cded86ced5a125bd240aa5ef74aca9fb
Author: Martin Zink
AuthorDate: Wed Mar 27 14:24:25 2024 +0100
MINIFICPP-2230 MergeContent should yield if no ready bins and no incoming
flowfiles
Co-authored-by: Ferenc Gerlits
Co-authored-by: Gabor Gyimesi
Signed-off-by: Gabor Gyimesi
This closes #1748
---
extensions/libarchive/BinFiles.cpp | 16 +---
extensions/libarchive/BinFiles.h | 2 +-
extensions/libarchive/tests/MergeFileTests.cpp | 24
3 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/extensions/libarchive/BinFiles.cpp
b/extensions/libarchive/BinFiles.cpp
index e2982973d..b0687d46e 100644
--- a/extensions/libarchive/BinFiles.cpp
+++ b/extensions/libarchive/BinFiles.cpp
@@ -223,11 +223,14 @@ bool BinFiles::resurrectFlowFiles(core::ProcessSession
) {
return had_failure;
}
-void BinFiles::assumeOwnershipOfNextBatch(core::ProcessSession ) {
+bool BinFiles::assumeOwnershipOfNextBatch(core::ProcessSession ) {
for (size_t i = 0; i < batchSize_; ++i) {
auto flow = session.get();
if (flow == nullptr) {
+ if (i == 0) { // Batch didn't contain a single flowfile, we should
yield if there are no ready bins either
+return false;
+ }
break;
}
@@ -242,6 +245,7 @@ void
BinFiles::assumeOwnershipOfNextBatch(core::ProcessSession ) {
session.transfer(flow, Self);
}
session.commit();
+ return true;
}
void BinFiles::processReadyBins(std::deque> ready_bins,
core::ProcessSession ) {
@@ -283,8 +287,14 @@ void BinFiles::onTrigger(core::ProcessContext& context,
core::ProcessSession& se
return;
}
- assumeOwnershipOfNextBatch(session);
- processReadyBins(gatherReadyBins(context), session);
+ const bool valid_batch = assumeOwnershipOfNextBatch(session);
+ if (auto ready_bins = gatherReadyBins(context); ready_bins.empty()) {
+if (!valid_batch) {
+ yield();
+}
+ } else {
+processReadyBins(std::move(ready_bins), session);
+ }
}
void BinFiles::transferFlowsToFail(core::ProcessSession ,
std::unique_ptr ) {
diff --git a/extensions/libarchive/BinFiles.h b/extensions/libarchive/BinFiles.h
index ab33e2c64..3dbb8fe86 100644
--- a/extensions/libarchive/BinFiles.h
+++ b/extensions/libarchive/BinFiles.h
@@ -279,7 +279,7 @@ class BinFiles : public core::Processor {
// Sort flow files retrieved from the flow file repository after restart to
their respective bins
bool resurrectFlowFiles(core::ProcessSession );
- void assumeOwnershipOfNextBatch(core::ProcessSession );
+ bool assumeOwnershipOfNextBatch(core::ProcessSession );
std::deque> gatherReadyBins(core::ProcessContext
);
void processReadyBins(std::deque> ready_bins,
core::ProcessSession );
diff --git a/extensions/libarchive/tests/MergeFileTests.cpp
b/extensions/libarchive/tests/MergeFileTests.cpp
index a98a18cf2..8c3015712 100644
--- a/extensions/libarchive/tests/MergeFileTests.cpp
+++ b/extensions/libarchive/tests/MergeFileTests.cpp
@@ -36,6 +36,7 @@
#include "MergeContent.h"
#include "processors/LogAttribute.h"
#include "TestBase.h"
+#include "SingleProcessorTestController.h"
#include "Catch.h"
#include "unit/ProvenanceTestHelper.h"
#include "serialization/FlowFileV3Serializer.h"
@@ -899,3 +900,26 @@ TEST_CASE_METHOD(MergeTestController, "Maximum Group Size
is respected", "[testM
REQUIRE(expiredFlowRecords.empty());
REQUIRE_FALSE(flow3);
}
+
+TEST_CASE("Empty MergeContent yields") {
+ const auto merge_content =
std::make_shared("mergeContent");
+
+ minifi::test::SingleProcessorTestController controller{merge_content};
+ controller.trigger();
+
+ CHECK(merge_content->isYield());
+}
+
+TEST_CASE("Empty MergeContent doesnt yield when processing readybins") {
+ const auto merge_content =
std::make_shared("mergeContent");
+
+ minifi::test::SingleProcessorTestController controller{merge_content};
+ controller.plan->setProperty(merge_content,
minifi::processors::MergeContent::MaxBinAge, "100ms");
+ controller.plan->setProperty(merge_content,
minifi::processors::MergeContent::MinEntries, "2");
+
+ auto first_trigger_results = controller.trigger("foo");
+ CHECK_FALSE(merge_content->isYield());
+ std::this_thread::sleep_for(100ms);
+ auto second_trigger_results = controller.trigger();
+ CHECK_FALSE(merge_content->isYield());
+}
(nifi) branch support/nifi-1.x updated: NIFI-12966 Upgraded Netty from 4.1.106 to 4.1.108
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 508dea2cbb NIFI-12966 Upgraded Netty from 4.1.106 to 4.1.108 508dea2cbb is described below commit 508dea2cbb005e4ca503a185c6b30dc07f5d606a Author: exceptionfactory AuthorDate: Wed Mar 27 21:22:04 2024 -0500 NIFI-12966 Upgraded Netty from 4.1.106 to 4.1.108 Signed-off-by: Pierre Villard This closes #8578. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8f6049067b..ac1980f7d7 100644 --- a/pom.xml +++ b/pom.xml @@ -145,7 +145,7 @@ 1.3.14 3.10.6.Final 2.2 -4.1.106.Final +4.1.108.Final 5.3.31 5.8.7 1.6.12
(nifi) branch main updated: NIFI-12965 Upgraded Guava from 32.1.2 to 33.1.0
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 64db927ca1 NIFI-12965 Upgraded Guava from 32.1.2 to 33.1.0 64db927ca1 is described below commit 64db927ca198dac335a3367686fb73bff5e00064 Author: exceptionfactory AuthorDate: Wed Mar 27 19:11:59 2024 -0500 NIFI-12965 Upgraded Guava from 32.1.2 to 33.1.0 Signed-off-by: Pierre Villard This closes #8577. --- minifi/pom.xml | 2 +- nifi-commons/nifi-property-protection-gcp/pom.xml | 2 +- nifi-nar-bundles/nifi-accumulo-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-azure-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/pom.xml | 2 +- nifi-nar-bundles/nifi-framework-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-gcp-bundle/pom.xml| 2 +- nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml | 2 +- nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-hive-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-iceberg-bundle/pom.xml| 2 +- nifi-nar-bundles/nifi-opentelemetry-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-standard-bundle/pom.xml | 2 +- .../nifi-standard-services/nifi-hbase_2-client-service-bundle/pom.xml | 2 +- nifi-registry/nifi-registry-core/pom.xml| 2 +- nifi-toolkit/nifi-toolkit-cli/pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/minifi/pom.xml b/minifi/pom.xml index 49951d7cd2..382fb3af03 100644 --- a/minifi/pom.xml +++ b/minifi/pom.xml @@ -458,7 +458,7 @@ limitations under the License. com.google.guava guava -32.1.2-jre +33.1.0-jre diff --git a/nifi-commons/nifi-property-protection-gcp/pom.xml b/nifi-commons/nifi-property-protection-gcp/pom.xml index cde1db53d7..77b04f8c41 100644 --- a/nifi-commons/nifi-property-protection-gcp/pom.xml +++ b/nifi-commons/nifi-property-protection-gcp/pom.xml @@ -23,7 +23,7 @@ nifi-property-protection-gcp 26.25.0 -32.1.2-jre +33.1.0-jre diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml b/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml index 5fde3178d7..cfdcf1fa90 100644 --- a/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml @@ -20,7 +20,7 @@ 2.1.2 -32.1.2-jre +33.1.0-jre nifi-accumulo-bundle diff --git a/nifi-nar-bundles/nifi-azure-bundle/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/pom.xml index ddaae43bb5..5103b7829d 100644 --- a/nifi-nar-bundles/nifi-azure-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-azure-bundle/pom.xml @@ -54,7 +54,7 @@ com.google.guava guava -32.1.2-jre +33.1.0-jre diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/pom.xml b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/pom.xml index a133cfcbe2..c5a2d32ab2 100644 --- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/pom.xml +++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/pom.xml @@ -42,7 +42,7 @@ com.google.guava guava -32.1.2-jre +33.1.0-jre commons-io diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml index 01a5e8d01e..548eed74a4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml @@ -24,7 +24,7 @@ NiFi: Framework Bundle 5.6.0 -32.1.2-jre +33.1.0-jre 2.9.1 4.3.0 diff --git a/nifi-nar-bundles/nifi-gcp-bundle/pom.xml b/nifi-nar-bundles/nifi-gcp-bundle/pom.xml index 64568d562d..1a8e4908a9 100644 --- a/nifi-nar-bundles/nifi-gcp-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-gcp-bundle/pom.xml @@ -43,7 +43,7 @@ com.google.guava guava -32.1.2-jre +33.1.0-jre diff --git a/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml b/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml index 46342bb02a..1c280f6ea1 100644 ---
(nifi) branch dependabot/npm_and_yarn/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/express-4.19.2 created (now af04097104)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/express-4.19.2 in repository https://gitbox.apache.org/repos/asf/nifi.git at af04097104 Bump express No new revisions were added by this update.
(nifi) branch main updated (8ef9528bf9 -> e5827c1026)
This is an automated email from the ASF dual-hosted git repository. mcgilman pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 8ef9528bf9 NIFI-12966 Upgraded Netty from 4.1.106 to 4.1.108 add e5827c1026 [NIFI-12941] - adding in jest-preset-angular to enable unit testing in Idea based IDEs (#8580) No new revisions were added by this update. Summary of changes: .../nifi-web/nifi-web-frontend/src/main/nifi/jest.config.ts | 11 ++- .../nifi-web-frontend/src/main/nifi/package-lock.json | 1 + .../nifi-web/nifi-web-frontend/src/main/nifi/package.json | 1 + .../nifi-web/nifi-web-frontend/src/main/nifi/setup-jest.ts| 1 + 4 files changed, 13 insertions(+), 1 deletion(-)
