TG-73

Исправление повторных поисков бинхоста

pym/update/update.py

@@ -15,6 +15,7 @@
 #  limitations under the License.
 from functools import wraps
 import random
+import asyncio
 
 import sys
 from os import path
@@ -1683,7 +1684,7 @@ class Update(MethodsInterface):
         retval = []
         skip_check_status = False
         actual_reason = self.Reason.UnknownError
-        for binhost in sorted(binhosts_data.get_binhosts(), reverse=True):
+        for binhost in sorted(asyncio.run(binhosts_data.get_asyncbinhosts()), reverse=True):
             host = binhost.host
             if not binhost.valid:
                 reason = self.Reason.WrongBinhost 

pym/update/utils/cl_update.py

@@ -91,10 +91,12 @@ def get_synchronization_tasks(object_name):
                   'method': Object(f'detect_best_binhost({object_name.lower()}.cl_update_ignore_level)'),
                   'essential': False,
                   'depend': (Tasks.success() & ~AllTasks.has_any("not_use_search") &
-                             (~AllTasks.success_one_of("check_current_binhost") |
+                             (AllTasks.failed_one_of("check_current_binhost") |
+                              AllTasks.failed_one_of("check_chosen_binhost") |
+                              (AllTasks.hasnot("check_current_binhost") &
+                               AllTasks.hasnot("check_chosen_binhost")) |
                              AllTasks.success_all("sync_reps"))),
                   'condition': lambda Get: Get('update.cl_update_use_migration_host') == 'off',
-                  'depend': AllTasks.hasnot("check_chosen_binhost"),
                  },
                  {'name': 'interrupt_on_no_leveled_binhost',
                   'method': Object("interrupt_on_no_leveled_binhost()"),