bbende opened a new pull request, #11875: URL: https://github.com/apache/nifi/pull/11875
…rove error handingling, prevent concurrent decommissions, report decommission status <!-- 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-16536](https://issues.apache.org/jira/browse/NIFI-16536) Fail fast: before stopping heartbeats, check whether the local node is the only CONNECTED node (clusterCoordinator.getNodeIdentifiers(NodeConnectionState.CONNECTED)). If it is, log a clear warning and abort the decommission without changing any local state. Roll back on failure: catch RuntimeException from requestNodeDisconnect() and requestNodeOffload(). For non-retryable failures (IllegalNodeDisconnectionException, IllegalNodeOffloadException), restore the clustered state and heartbeating (or request reconnection for the local node) so the node stays a healthy cluster member instead of being stranded. The check in (1) narrows the window but cannot close it, so (2) is still needed. Single decommission at a time: each DELETE on /health/cluster starts a new virtual thread. Because decommission() is synchronized, repeated requests queue up and run again after the first one finishes. A request while a decommission is already running should return 202 (or 409) without starting another task. Report the outcome: GET /health/cluster only reports the connection state, so a caller that starts a decommission cannot tell that it failed and will poll indefinitely. Adding the decommission outcome to the response, for example a second line Decommission Status: IN_PROGRESS | FAILED: <reason> | COMPLETED, lets tools that drive decommission through nifi.sh decommission and nifi.sh cluster-status react to a failure. The existing Cluster Status: line stays unchanged for compatibility. # 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 - [X] Build completed using `./mvnw clean install -P contrib-check` - [X] JDK 21 - [X] 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 -- 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]
