Kerr0220 opened a new pull request, #6507: URL: https://github.com/apache/nifi/pull/6507
<!-- 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-10622](https://issues.apache.org/jira/browse/NIFI-10622) Following the problem in the issue **NIFI-10622**, I looked through the test code and find that the checksum calculated by test peer is hard coded as "3057746557" in testTransferTwoFiles(): ``` java // Commit transaction final int flowFileSent = serverProtocol.commitTransferTransaction(peer, "3058746557"); ``` Therefore, the problem must be caused by the other peer, where the checksum is calculated as another value. Then, I dived into the codes where the checksum is calculated and found that this non-deterministic problem is caused by ```java // module: nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site // file: remote/protocol/AbstractFlowFileServerProtocol.java final DataPacket dataPacket = new StandardDataPacket(toSend.getAttributes(), in, toSend.getSize()); ``` since the determination of `getAttributed()` is: ```java public Map<String, String> getAttributes() { return Collections.unmodifiableMap(this.attributes); } ``` and the order of elements return by it is non-deterministic. To minimize the influence, I sort the elements after retrieving them and store them in `LinkedHashMap`: ```java LinkedHashMap<String, String> attributes = new LinkedHashMap<>(); String[] keySet = toSend.getAttributes().keySet().toArray(new String[0]); Arrays.sort(keySet); for(String key: keySet){ attributes.put(key, toSend.getAttributes().get(key)); } final DataPacket dataPacket = new StandardDataPacket(attributes, in, toSend.getSize()); ``` In this case, the checksum will always be calculated as `4171232842`. So I changed the checksum in the test case to this value. Since the rest of the flaky tests mentioned in the issue are all based on `testSendLargeFile`, I fix them by modifying the checksum `1527414060` to `2387509971`. Finally, these tests are not flaky and can pass NonDex's check. # 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) 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 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 `mvn clean install -P contrib-check` - [x] JDK 8 - [ ] JDK 11 - [ ] JDK 17 ### 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]
