218a0bb719
- Several fixes for tests to avoid errors and failures in some OSes - Speed up salt.matcher.confirm_top by using __context__ - Do not call the async wrapper calls with the separate thread - Prevent OOM with high amount of batch async calls (bsc#1216063) - Add missing contextvars dependency in salt.version - Skip tests for unsupported algorithm on old OpenSSL version - Remove redundant `_file_find` call to the master - Prevent possible exception in tornado.concurrent.Future._set_done - Make reactor engine less blocking the EventPublisher - Make salt-master self recoverable on killing EventPublisher - Improve broken events catching and reporting - Make logging calls lighter - Remove unused import causing delays on starting salt-master - Added: * improve-broken-events-catching-and-reporting.patch * add-missing-contextvars-dependency-in-salt.version.patch * prevent-oom-with-high-amount-of-batch-async-calls-bs.patch * speed-up-salt.matcher.confirm_top-by-using-__context.patch * remove-redundant-_file_find-call-to-the-master.patch * make-logging-calls-lighter.patch * make-salt-master-self-recoverable-on-killing-eventpu.patch * skip-tests-for-unsupported-algorithm-on-old-openssl-.patch * remove-unused-import-causing-delays-on-starting-salt.patch * do-not-call-the-async-wrapper-calls-with-the-separat.patch * prevent-possible-exception-in-tornado.concurrent.fut.patch * several-fixes-for-tests-to-avoid-errors-and-failures.patch * make-reactor-engine-less-blocking-the-eventpublisher.patch OBS-URL: https://build.opensuse.org/request/show/1177104 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=243
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From 768495df67725ae840b06d321bef8299eca2368a Mon Sep 17 00:00:00 2001
|
|
From: Victor Zhestkov <vzhestkov@suse.com>
|
|
Date: Wed, 15 May 2024 09:47:40 +0200
|
|
Subject: [PATCH] Remove redundant `_file_find` call to the master
|
|
|
|
---
|
|
salt/fileclient.py | 10 ++--------
|
|
1 file changed, 2 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/salt/fileclient.py b/salt/fileclient.py
|
|
index f01a86dd0d..f4b8d76dbe 100644
|
|
--- a/salt/fileclient.py
|
|
+++ b/salt/fileclient.py
|
|
@@ -1162,10 +1162,7 @@ class RemoteClient(Client):
|
|
if senv:
|
|
saltenv = senv
|
|
|
|
- if not salt.utils.platform.is_windows():
|
|
- hash_server, stat_server = self.hash_and_stat_file(path, saltenv)
|
|
- else:
|
|
- hash_server = self.hash_file(path, saltenv)
|
|
+ hash_server = self.hash_file(path, saltenv)
|
|
|
|
# Check if file exists on server, before creating files and
|
|
# directories
|
|
@@ -1206,10 +1203,7 @@ class RemoteClient(Client):
|
|
)
|
|
|
|
if dest2check and os.path.isfile(dest2check):
|
|
- if not salt.utils.platform.is_windows():
|
|
- hash_local, stat_local = self.hash_and_stat_file(dest2check, saltenv)
|
|
- else:
|
|
- hash_local = self.hash_file(dest2check, saltenv)
|
|
+ hash_local = self.hash_file(dest2check, saltenv)
|
|
|
|
if hash_local == hash_server:
|
|
return dest2check
|
|
--
|
|
2.45.0
|
|
|