Add task exclude filter

docs/adding_tracks.rst

@@ -305,7 +305,7 @@ To specify different workloads in the same track you can use so-called challenge
 
 When should you use challenges? Challenges are useful when you want to run completely different workloads based on the same track but for the majority of cases you should get away without using challenges:
 
-* To run only a subset of the tasks, you can use :ref:`task filtering <clr_include_tasks>`, e.g. ``--include-tasks="create-index,bulk"`` will only run these two tasks in the track above.
+* To run only a subset of the tasks, you can use :ref:`task filtering <clr_include_tasks>`, e.g. ``--include-tasks="create-index,bulk"`` will only run these two tasks in the track above or ``--exclude-tasks="bulk"`` will run all tasks except for `bulk`
 * To vary parameters, e.g. the number of clients, you can use :ref:`track parameters <clr_track_params>`
 
 Structuring your track

docs/command_line_reference.rst

@@ -287,6 +287,19 @@ You can use ``--include-tasks`` to specify a comma-separated list of tasks that
 * Execute only tasks of type ``search``: ``--include-tasks="type:search"``
 * You can also mix and match: ``--include-tasks="index,type:search"``
 
+``exclude-tasks``
+~~~~~~~~~~~~~~~~~
+
+Similarly to :ref:`include-tasks <clr_include_tasks>` when challenge consists of one or more tasks you might be interested in excluding a single operations but include the rest.
+
+You can use ``--exclude-tasks`` to specify a comma-separated list of tasks that you want to skip. Each item in the list defines either the name of a task or the operation type of a task. Only the tasks that did not match will be executed.
+
+**Examples**:
+
+* Do not execute any tasks with the name ``index`` and ``term``: ``--exclude-tasks="index,term"``
+* Do not execute any tasks of type ``search``: ``--exclude-tasks="type:search"``
+* You can also mix and match: ``--exclude-tasks="index,type:search"``
+
 ``team-repository``
 ~~~~~~~~~~~~~~~~~~~
 

esrally/track/loader.py

@@ -632,6 +632,8 @@ def filter_tasks(t, filters, exclude=False):
     def filter_out_match(task, filters, exclude):
         for f in filters:
             if task.matches(f):
+                if hasattr(task, 'tasks') and exclude:
+                    return False
                 return exclude
         return not exclude
 
@@ -673,7 +675,7 @@ def filters_from_filtered_tasks(filtered_tasks):
                     filters.append(track.TaskOpTypeFilter(spec[1]))
                 else:
                     raise exceptions.SystemSetupError(
-                        "Invalid format for included tasks: [%s]. Expected [type] but got [%s]." % (t, spec[0]))
+                        "Invalid format for filtered tasks: [%s]. Expected [type] but got [%s]." % (t, spec[0]))
             else:
                 raise exceptions.SystemSetupError("Invalid format for filtered tasks: [%s]" % t)
     return filters

tests/track/loader_test.py

@@ -1256,11 +1256,11 @@ def test_sets_absolute_path(self, path_exists):
 
 
 class TrackFilterTests(TestCase):
-    def test_create_filters_from_empty_included_tasks(self):
+    def test_create_filters_from_empty_filtered_tasks(self):
         self.assertEqual(0, len(loader.filters_from_filtered_tasks(None)))
         self.assertEqual(0, len(loader.filters_from_filtered_tasks([])))
 
-    def test_create_filters_from_mixed_included_tasks(self):
+    def test_create_filters_from_mixed_filtered_tasks(self):
         filters = loader.filters_from_filtered_tasks(["force-merge", "type:search"])
         self.assertListEqual([track.TaskNameFilter("force-merge"), track.TaskOpTypeFilter("search")], filters)
 
@@ -1272,7 +1272,7 @@ def test_rejects_invalid_syntax(self):
     def test_rejects_unknown_filter_type(self):
         with self.assertRaises(exceptions.SystemSetupError) as ctx:
             loader.filters_from_filtered_tasks(["valid", "op-type:index"])
-        self.assertEqual("Invalid format for included tasks: [op-type:index]. Expected [type] but got [op-type].", ctx.exception.args[0])
+        self.assertEqual("Invalid format for filtered tasks: [op-type:index]. Expected [type] but got [op-type].", ctx.exception.args[0])
 
     def test_filters_tasks(self):
         track_specification = {
@@ -1428,12 +1428,12 @@ def test_filters_exclude_tasks(self):
         full_track = reader("unittest", track_specification, "/mappings")
         self.assertEqual(4, len(full_track.challenges[0].schedule))
 
-        filtered = loader.filter_tasks(full_track, [track.TaskNameFilter("index-3")], exclude=True)
+        filtered = loader.filter_tasks(full_track, [track.TaskNameFilter("index-3"), track.TaskOpTypeFilter("search")], exclude=True)
 
         schedule = filtered.challenges[0].schedule
         self.assertEqual(3, len(schedule))
-        self.assertEqual("node-stats", schedule[0].name)
-        self.assertEqual("match-all-serial", schedule[1].name)
+        self.assertEqual(["index-1",'index-2'], [t.name for t in schedule[0].tasks])
+        self.assertEqual("node-stats", schedule[1].name)
         self.assertEqual("cluster-stats", schedule[2].name)
 
 class TrackSpecificationReaderTests(TestCase):