@@ -1123,7 +1123,11 @@ def _reload_taskdefs(self) -> None:
11231123 # Log tasks orphaned by a reload but not currently in the task pool.
11241124 for name in orphans :
11251125 if name not in (itask .tdef .name for itask in tasks ):
1126- LOG .warning ("Removed task: '%s'" , name )
1126+ LOG .info ("Removed task: '%s'" , name )
1127+ # Store lists of tasks which were active before reload.
1128+ warn_tasks : List [str ] = []
1129+ _warn_tasks : List [str ] = []
1130+
11271131 for itask in tasks :
11281132 if itask .tdef .name in orphans :
11291133 if (
@@ -1136,7 +1140,7 @@ def _reload_taskdefs(self) -> None:
11361140 else :
11371141 # Keep active orphaned task, but stop it from spawning.
11381142 itask .graph_children = {}
1139- LOG .warning (
1143+ LOG .info (
11401144 f"[{ itask } ] will not spawn children "
11411145 "- task definition removed"
11421146 )
@@ -1158,15 +1162,18 @@ def _reload_taskdefs(self) -> None:
11581162 self ._swap_out (new_task )
11591163 self .data_store_mgr .delta_task_prerequisite (new_task )
11601164 LOG .info (f"[{ itask } ] reloaded task definition" )
1165+
11611166 if itask .state (* TASK_STATUSES_ACTIVE ):
1162- LOG .warning (
1163- f"[{ itask } ] active with pre-reload settings"
1164- )
1167+ warn_tasks .append (str (itask ))
11651168 elif itask .state (TASK_STATUS_PREPARING ):
11661169 # Job file might have been written at this point?
1167- LOG .warning (
1168- f"[{ itask } ] may be active with pre-reload settings"
1169- )
1170+ _warn_tasks .append (str (itask ))
1171+
1172+ for may , tasks in (('' , warn_tasks ), ('may be' , _warn_tasks )):
1173+ if tasks :
1174+ _tasks = "\n * " .join (tasks )
1175+ LOG .info (
1176+ f"Tasks { may } active with pre-reload settings:\n { _tasks } " )
11701177
11711178 # Reassign live tasks to the internal queue
11721179 del self .task_queue_mgr
@@ -1250,22 +1257,18 @@ def warn_stop_orphans(self) -> None:
12501257 orphans_kill_failed .append (itask )
12511258 else :
12521259 orphans .append (itask )
1253- if orphans_kill_failed :
1254- LOG .warning (
1255- "Orphaned tasks (kill failed):\n "
1256- + "\n " .join (
1257- f"* { itask .identity } ({ itask .state .status } )"
1258- for itask in orphans_kill_failed
1259- )
1260- )
1261- if orphans :
1262- LOG .warning (
1263- "Orphaned tasks:\n "
1264- + "\n " .join (
1265- f"* { itask .identity } ({ itask .state .status } )"
1266- for itask in orphans
1260+
1261+ for orphanlist , extra_text in (
1262+ (orphans_kill_failed , ' (kill failed)' ),
1263+ (orphans , '' )
1264+ ):
1265+ if orphanlist :
1266+ LOG .warning (
1267+ f"Orphaned tasks{ extra_text } :\n "
1268+ + "\n " .join (
1269+ f"* { itask .identity } ({ itask .state .status } )"
1270+ for itask in orphanlist )
12671271 )
1268- )
12691272
12701273 for id_key in self .task_events_mgr ._event_timers :
12711274 LOG .warning (
0 commit comments