(accumulo) branch main updated (5b35bf721e -> 7fd7762f10)

[kr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

krathbun pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


    from 5b35bf721e Merge branch '2.1'
     add bdbe4f5173 Fix to some shared mini cluster ITs (#5579)
     new 7fd7762f10 Merge branch '2.1'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/maven.yaml                       |  2 ++
 ...junit.sh => find-startMini-without-stopMini.sh} | 33 +++++++++++-----------
 2 files changed, 18 insertions(+), 17 deletions(-)
 copy src/build/ci/{find-unapproved-junit.sh => find-startMini-without-stopMini.sh} (50%)

(accumulo) 01/01: Merge branch '2.1'

[kr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

krathbun pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 7fd7762f10d06acc9b7e607ef5c1a956eb01d3ba
Merge: 5b35bf721e bdbe4f5173
Author: Kevin Rathbun <ke...@gmail.com>
AuthorDate: Fri May 23 11:04:07 2025 -0400

    Merge branch '2.1'

 .github/workflows/maven.yaml                    |  2 +
 src/build/ci/find-startMini-without-stopMini.sh | 54 +++++++++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --cc src/build/ci/find-startMini-without-stopMini.sh
index 0000000000,937909e2fe..60310d3d2f
mode 000000,100755..100755
--- a/src/build/ci/find-startMini-without-stopMini.sh
+++ b/src/build/ci/find-startMini-without-stopMini.sh
@@@ -1,0 -1,54 +1,54 @@@
+ #! /usr/bin/env bash
+ #
+ # 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
+ #
+ #   https://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.
+ #
+ 
+ # The purpose of this ci script is to ensure that a pull request doesn't
+ # unintentionally add a test with startMiniCluster without stopping it
+ # with stopMiniCluster.
+ NUM_EXPECTED=0
+ ALLOWED=(
 -  #Uncomment when merging to main
 -  #test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_2_IT.java
 -  #test/src/main/java/org/apache/accumulo/test/compaction/FlakyExternalCompaction2IT.java
++  # the super class stops the MAC
++  test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_2_IT.java
++  test/src/main/java/org/apache/accumulo/test/compaction/FlakyExternalCompaction2IT.java
+ )
+ 
+ ALLOWED_PIPE_SEP=$({ for x in "${ALLOWED[@]}"; do echo "$x"; done; } | paste -sd'|')
+ 
+ function findallstopminiproblems() {
+   # -F for fixed-string matching, -R for recursive, -l for matching files
+   local opts='-FRL'
+   if [[ $1 == 'print' ]]; then
+     # -F for fixed-string matching, -R for recursive, -l for matching files, -H for always showing filenames
+     opts='-FRLH'
+   fi
+   # find any new classes using startMiniCluster without using stopMiniCluster, except those allowed
+   grep -FRl --include='*.java' startMiniCluster | xargs grep "$opts" stopMiniCluster | grep -Pv "^(${ALLOWED_PIPE_SEP//./[.]})\$"
+ }
+ 
+ function comparecounts() {
+   local count
+   count=$(findallstopminiproblems | wc -l)
+   if [[ $NUM_EXPECTED -ne $count ]]; then
+     echo "Expected $NUM_EXPECTED, but found $count unapproved classes using startMiniCluster without stopMiniCluster:"
+     findallstopminiproblems 'print'
+     return 1
+   fi
+ }
+ 
+ comparecounts && echo "Found exactly $NUM_EXPECTED unapproved uses of startMiniCluster without stopMiniCluster, as expected"