Fix missing log warning for failed attempts at removing tasks

Partially reverts e6c4adf

Author: MetRonnie

cylc/flow/commands.py

@@ -161,6 +161,7 @@ def _remove_matched_tasks(
     schd: 'Scheduler',
     ids: Set[TaskTokens],
     flow_nums: 'FlowNums',
+    warn_unremovable: bool = True,
 ):
     """Remove matched tasks."""
     # Mapping of *relative* task IDs to removed flow numbers:
@@ -267,15 +268,14 @@ def _remove_matched_tasks(
             )
         LOG.info(f"Removed tasks: {', '.join(sorted(tasks_str_list))}")
 
-    if not_removed:
+    if warn_unremovable and not_removed:
         fnums_str = (
             repr_flow_nums(flow_nums, full=True) if flow_nums else ''
         )
         tasks_str = ', '.join(
             sorted(tokens.relative_id for tokens in not_removed)
         )
-        # This often does not indicate an error - e.g. for group trigger.
-        LOG.debug(f"Task(s) not removable: {tasks_str} {fnums_str}")
+        LOG.warning(f"Task(s) not removable: {tasks_str} {fnums_str}")
 
     if removed and schd.pool.compute_runahead():
         schd.pool.release_runahead_tasks()
@@ -806,7 +806,12 @@ def _force_trigger_tasks(
     # Remove all inactive and selected active group members.
     if flow != [FLOW_NONE]:
         # (No need to remove tasks if triggering with no-flow).
-        _remove_matched_tasks(schd, {*active_to_remove, *inactive}, flow_nums)
+        _remove_matched_tasks(
+            schd,
+            {*active_to_remove, *inactive},
+            flow_nums,
+            warn_unremovable=False,
+        )
 
         # trigger should override the held state, however, in-group tasks may
         # have previously been held and active in-group tasks will become

tests/integration/test_remove.py

@@ -15,9 +15,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
+
 import pytest
 
-from cylc.flow import CYLC_LOG
 from cylc.flow.commands import (
     force_trigger_tasks,
     reload_workflow,
@@ -261,15 +261,14 @@ async def test_logging(
         # Invalid tasks:
         '2005/a', '2000/doh',
     ]
-    async with start(schd) as log:
-        log.set_level(logging.DEBUG, CYLC_LOG)
+    async with start(schd):
         await run_cmd(remove_tasks(schd, tasks_to_remove, []))
 
     assert log_filter(
         logging.INFO, "Removed tasks: 2000/a (flows=1), 2000/b (flows=1)"
     )
 
-    assert log_filter(logging.DEBUG, "Task(s) not removable: 2001/a, 2001/b")
+    assert log_filter(logging.WARNING, "Task(s) not removable: 2001/a, 2001/b")
     assert log_filter(logging.WARNING, "Invalid cycle point for task: a, 2005")
     assert log_filter(
         logging.WARNING, "No tasks match the IDs:\n* 2000/doh\n* 2005/a"
@@ -283,13 +282,12 @@ async def test_logging_flow_nums(
 ):
     """Test logging of task removals involving flow numbers."""
     schd: Scheduler = scheduler(example_workflow)
-    async with start(schd) as log:
-        log.set_level(logging.DEBUG, CYLC_LOG)
+    async with start(schd):
         await run_cmd(force_trigger_tasks(schd, ['1/a1'], ['1', '2']))
         # Removing from flow that doesn't exist doesn't work:
         await run_cmd(remove_tasks(schd, ['1/a1'], ['3']))
         assert log_filter(
-            logging.DEBUG, "Task(s) not removable: 1/a1 (flows=3)"
+            logging.WARNING, "Task(s) not removable: 1/a1 (flows=3)"
         )
 
         # But if a valid flow is included, it will be removed from that flow: