Merge branch '3006.x' into 3006_x_manjaro_arm_correct_os_family

changelog/66467.removed.md

@@ -0,0 +1 @@
+Remove psutil_compat.py file, which should have been removed when RHEL 6 EOL

changelog/66726.fixed.md

@@ -0,0 +1 @@
+Clean up multiprocessing file handles on minion

requirements/pytest.txt

@@ -13,3 +13,5 @@ flaky
 more-itertools
 pyfakefs
 trustme
+pytest-skip-markers >= 1.5.2 ; python_version >= '3.8'
+pytest-skip-markers <= 1.5.1 ; python_version < '3.8'

requirements/static/ci/py3.10/cloud.txt

@@ -482,9 +482,10 @@ pytest-shell-utilities==1.8.0
     # via
     #   -c requirements/static/ci/py3.10/linux.txt
     #   pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
     #   -c requirements/static/ci/py3.10/linux.txt
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.10/darwin.txt

@@ -337,8 +337,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.10/freebsd.txt

@@ -330,8 +330,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.10/linux.txt

@@ -347,8 +347,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.10/windows.txt

@@ -308,8 +308,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.11/cloud.txt

@@ -446,9 +446,10 @@ pytest-shell-utilities==1.8.0
     # via
     #   -c requirements/static/ci/py3.11/linux.txt
     #   pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
     #   -c requirements/static/ci/py3.11/linux.txt
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.11/darwin.txt

@@ -308,8 +308,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.11/freebsd.txt

@@ -307,8 +307,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.11/linux.txt

@@ -324,8 +324,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.11/windows.txt

@@ -304,8 +304,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.12/cloud.txt

@@ -446,9 +446,10 @@ pytest-shell-utilities==1.8.0
     # via
     #   -c requirements/static/ci/py3.12/linux.txt
     #   pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
     #   -c requirements/static/ci/py3.12/linux.txt
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.12/darwin.txt

@@ -308,8 +308,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.12/freebsd.txt

@@ -307,8 +307,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.12/linux.txt

@@ -324,8 +324,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.12/windows.txt

@@ -304,8 +304,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.7/cloud.txt

@@ -530,9 +530,10 @@ pytest-shell-utilities==1.8.0
     # via
     #   -c requirements/static/ci/py3.7/linux.txt
     #   pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.0 ; python_version < "3.8"
     # via
     #   -c requirements/static/ci/py3.7/linux.txt
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.7/freebsd.txt

@@ -371,8 +371,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.0 ; python_version < "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.7/linux.txt

@@ -383,8 +383,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.0 ; python_version < "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.7/windows.txt

@@ -323,8 +323,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.0 ; python_version < "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.8/cloud.txt

@@ -516,9 +516,10 @@ pytest-shell-utilities==1.8.0
     # via
     #   -c requirements/static/ci/py3.8/linux.txt
     #   pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
     #   -c requirements/static/ci/py3.8/linux.txt
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.8/freebsd.txt

@@ -357,8 +357,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.8/linux.txt

@@ -369,8 +369,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.8/windows.txt

@@ -309,8 +309,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.9/cloud.txt

@@ -518,9 +518,10 @@ pytest-shell-utilities==1.8.0
     # via
     #   -c requirements/static/ci/py3.9/linux.txt
     #   pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
     #   -c requirements/static/ci/py3.9/linux.txt
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.9/darwin.txt

@@ -366,8 +366,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.9/freebsd.txt

@@ -359,8 +359,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.9/linux.txt

@@ -369,8 +369,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.9/windows.txt

@@ -310,8 +310,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

salt/utils/platform.py

@@ -228,7 +228,11 @@ def is_aarch64():
     """
     Simple function to return if host is AArch64 or not
     """
-    return platform.machine().startswith("aarch64")
+    if is_darwin():
+        # Allow for MacOS Arm64 platform returning differently from Linux
+        return platform.machine().startswith("arm64")
+    else:
+        return platform.machine().startswith("aarch64")
 
 
 def spawning_platform():

salt/utils/process.py

@@ -1169,10 +1169,17 @@ def add(self, proc):
 
     def cleanup(self):
         with self.lock:
-            for proc in self.processes:
-                if proc.is_alive():
-                    continue
-                proc.join()
+            for proc in self.processes[:]:
+                proc.join(0.01)
+                if hasattr(proc, "exitcode"):
+                    # Only processes have exitcode and a close method, threads
+                    # do not.
+                    if proc.exitcode is None:
+                        continue
+                    proc.close()
+                else:
+                    if proc.is_alive():
+                        continue
                 self.processes.remove(proc)
                 self.count -= 1
                 log.debug("Subprocess %s cleaned up", proc.name)