ing-mattioni opened a new pull request, #11191: URL: https://github.com/apache/nifi/pull/11191
<!-- 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. --> # Summary [NIFI-00000](https://issues.apache.org/jira/browse/NIFI-00000) # Tracking Please complete the following tracking steps prior to pull request creation. ### Issue Tracking - [Apache NiFi Jira](https://issues.apache.org/jira/browse/NIFI) issue created ### Pull Request Tracking - Pull Request title starts with Apache NiFi Jira issue number, such as `NIFI-00000` - Pull Request commit message starts with Apache NiFi Jira issue number, as such `NIFI-00000` - Pull request contains [commits signed](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits) with a registered key indicating `Verified` status ### Pull Request Formatting - Pull Request based on current revision of the `main` branch - Pull Request refers to a feature branch with one commit containing changes # Verification Please indicate the verification steps performed prior to pull request creation. ### Build - [ ] Build completed using `./mvnw clean install -P contrib-check` - [ ] JDK 21 - [ ] JDK 25 ### Licensing - [ ] New dependencies are compatible with the [Apache License 2.0](https://apache.org/licenses/LICENSE-2.0) according to the [License Policy](https://www.apache.org/legal/resolved.html) - [ ] New dependencies are documented in applicable `LICENSE` and `NOTICE` files ### Documentation - [ ] Documentation formatting appears as expected in rendered files # Summary [NIFI-15892](https://issues.apache.org/jira/browse/NIFI-15892) This pull request updates `ConsumeAMQP` manual acknowledgement handling for batched deliveries. When `Auto-Acknowledge Messages` is set to `false` and `Batch Size` is greater than 1, `ConsumeAMQP` acknowledges the last delivery tag after a successful `ProcessSession` commit using cumulative acknowledgement. The previous implementation registered only the successful commit callback. If the `ProcessSession` commit failed or could not complete successfully, outstanding AMQP deliveries could remain unacknowledged until the broker closed the channel, for example due to RabbitMQ `consumer_timeout`. This change adds explicit negative acknowledgement handling for the commit failure path. ## Changes - Preserves the existing successful commit behavior: - `basicAck(lastDeliveryTag, true)` - Adds commit failure handling: - `basicNack(lastDeliveryTag, true, true)` - Keeps the existing behavior unchanged for `Auto-Acknowledge Messages = true` - Preserves cumulative acknowledgement behavior for batched manual acknowledgements - Improves reliability when using: - `Auto-Acknowledge Messages = false` - `Batch Size > 1` - RabbitMQ / AMQP 0.9.1 brokers with consumer acknowledgement timeout enabled # Tracking Please complete the following tracking steps prior to pull request creation. ### Issue Tracking - [x] [Apache NiFi Jira](https://issues.apache.org/jira/browse/NIFI-15892) issue created ### Pull Request Tracking - [x] Pull Request title starts with Apache NiFi Jira issue number, such as `NIFI-00000` - [x] Pull Request commit message starts with Apache NiFi Jira issue number, as such `NIFI-00000` - [ ] Pull request contains [commits signed](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits) with a registered key indicating `Verified` status ### Pull Request Formatting - [x] Pull Request based on current revision of the `main` branch - [x] Pull Request refers to a feature branch with one commit containing changes # Verification Please indicate the verification steps performed prior to pull request creation. ### Build - [ ] Build completed using `./mvnw clean install -P contrib-check` - [ ] JDK 21 - [ ] JDK 25 Module-level verification performed: ```bash ./mvnw -pl nifi-extension-bundles/nifi-amqp-bundle/nifi-amqp-processors -am clean test or on Windows PowerShell: .\mvnw.cmd -pl nifi-extension-bundles\nifi-amqp-bundle\nifi-amqp-processors -am clean test ### Licensing - [x] New dependencies are compatible with the [Apache License 2.0](https://apache.org/licenses/LICENSE-2.0) according to the [License Policy](https://www.apache.org/legal/resolved.html) - [x] New dependencies are documented in applicable `LICENSE` and `NOTICE` files No new dependencies were added. ### Documentation - [x] Documentation formatting appears as expected in rendered files No user-facing documentation files were changed. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
