Skip to content

Commit 07cdb01

Browse files
ebadyanoebadyano
authored
Remove MergePart race configurations (elastic#122)
Closes: elastic/night-rally#118
1 parent a5bc341 commit 07cdb01

File tree

3 files changed

+9
-52
lines changed

3 files changed

+9
-52
lines changed

‎night_rally/night_rally.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -304,9 +304,6 @@ def runnable(self, race_config):
304304
# we don't support (yet?) clusters with multiple Docker containers
305305
if len(race_config.target_hosts) > 1:
306306
return False
307-
# we are not interested in those metrics for Docker
308-
if race_config.car in ["verbose_iw"]:
309-
return False
310307
# transport-nio has been introduced in Elasticsearch 7.0.
311308
if int(self.distribution_version[0]) < 7 and "transport-nio" in race_config.plugins:
312309
return False

‎night_rally/resources/race-configs-group-1.json

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,6 @@
6464
],
6565
"challenge": "append-fast-with-conflicts",
6666
"car": "4gheap"
67-
},
68-
{
69-
"name": "geonames-append-verbose_iw-1node",
70-
"#COMMENT": "Actually, we should not produce graphs for this one because indexing throughput is not that useful here.",
71-
"charts": [],
72-
"challenge": "append-no-conflicts-index-only",
73-
"track-params": {
74-
"number_of_replicas": 0
75-
},
76-
"car": "4gheap",
77-
"car-params": {
78-
"verbose_iw_logging_enabled": "true"
79-
}
8067
}
8168
]
8269
}
@@ -144,19 +131,6 @@
144131
],
145132
"challenge": "append-fast-with-conflicts",
146133
"car": "4gheap"
147-
},
148-
{
149-
"name": "geonames-append-verbose_iw-1node",
150-
"#COMMENT": "Actually, we should not produce graphs for this one because indexing throughput is not that useful here.",
151-
"charts": [],
152-
"challenge": "append-no-conflicts-index-only",
153-
"track-params": {
154-
"number_of_replicas": 0
155-
},
156-
"car": "4gheap",
157-
"car-params": {
158-
"verbose_iw_logging_enabled": "true"
159-
}
160134
}
161135
]
162136
},

‎tests/night_rally_test.py

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -319,10 +319,7 @@ def test_run_two_oss_challenges_successfully(self, mocked_wait_until_port_is_fre
319319
"io"
320320
],
321321
"challenge": "append-no-conflicts",
322-
"car": "defaults",
323-
"car-params": {
324-
"verbose_iw_logging_enabled": "true"
325-
}
322+
"car": "defaults"
326323
},
327324
{
328325
"name": "geonames-append-4g-1node",
@@ -356,7 +353,6 @@ def test_run_two_oss_challenges_successfully(self, mocked_wait_until_port_is_fre
356353
"--effective-start-date=\"2016-01-01 00:00:00\" --track=\"geonames\" "
357354
"--challenge=\"append-no-conflicts\" --car=\"defaults\" --client-options=\"timeout:240\" "
358355
"--user-tag=\"name:geonames-append-1node,setup:bare,race-configs-id:{},license:oss\" --runtime-jdk=\"8\" "
359-
"--car-params=\"{{\\\"verbose_iw_logging_enabled\\\": \\\"true\\\"}}\" "
360356
"--pipeline=\"from-sources-complete\" "
361357
"--revision=\"@2016-01-01T00:00:00Z\"".format(race_configs_id),
362358

@@ -388,10 +384,7 @@ def test_run_two_mixed_license_challenges_successfully(self, mocked_wait_until_p
388384
{
389385
"name": "geonames-defaults",
390386
"challenge": "append-no-conflicts",
391-
"car": "defaults",
392-
"car-params": {
393-
"verbose_iw_logging_enabled": "true"
394-
}
387+
"car": "defaults"
395388
},
396389
{
397390
"name": "geonames-4g",
@@ -411,10 +404,7 @@ def test_run_two_mixed_license_challenges_successfully(self, mocked_wait_until_p
411404
{
412405
"name": "geonames-defaults",
413406
"challenge": "append-no-conflicts",
414-
"car": "defaults",
415-
"car-params": {
416-
"verbose_iw_logging_enabled": "true"
417-
}
407+
"car": "defaults"
418408
},
419409
{
420410
"name": "geonames-4g",
@@ -441,7 +431,6 @@ def test_run_two_mixed_license_challenges_successfully(self, mocked_wait_until_p
441431
"--effective-start-date=\"2016-01-01 00:00:00\" --track=\"geonames\" "
442432
"--challenge=\"append-no-conflicts\" --car=\"defaults\" --client-options=\"timeout:240\" "
443433
"--user-tag=\"name:geonames-defaults,setup:bare,race-configs-id:{},license:oss\" --runtime-jdk=\"8\" "
444-
"--car-params=\"{{\\\"verbose_iw_logging_enabled\\\": \\\"true\\\"}}\" "
445434
"--pipeline=\"from-sources-complete\" "
446435
"--revision=\"@2016-01-01T00:00:00Z\"".format(race_configs_id),
447436

@@ -455,7 +444,6 @@ def test_run_two_mixed_license_challenges_successfully(self, mocked_wait_until_p
455444
"--effective-start-date=\"2016-01-01 00:00:00\" --track=\"geonames\" "
456445
"--challenge=\"append-no-conflicts\" --car=\"defaults,basic-license\" --client-options=\"timeout:240\" "
457446
"--user-tag=\"name:geonames-defaults,setup:bare,race-configs-id:{},license:basic\" --runtime-jdk=\"8\" "
458-
"--car-params=\"{{\\\"verbose_iw_logging_enabled\\\": \\\"true\\\"}}\" "
459447
"--pipeline=\"from-sources-complete\" --revision=\"@2016-01-01T00:00:00Z\"".format(race_configs_id),
460448

461449
"rally --skip-update --configuration-name=\"nightly\" --quiet --target-host=\"localhost:39200\" "
@@ -1302,10 +1290,7 @@ def test_run_docker_5x_benchmark(self, mocked_wait_until_port_is_free):
13021290
{
13031291
"name": "geonames-4g",
13041292
"challenge": "append-no-conflicts",
1305-
"car": "4gheap",
1306-
"car-params": {
1307-
"verbose_iw_logging_enabled": "true"
1308-
}
1293+
"car": "4gheap"
13091294
}
13101295
]
13111296
}
@@ -1336,11 +1321,12 @@ def test_run_docker_5x_benchmark(self, mocked_wait_until_port_is_free):
13361321
"rally --skip-update --configuration-name=\"release\" --quiet --target-host=\"localhost:39200\" "
13371322
"--effective-start-date=\"2016-01-01 00:00:00\" --track=\"geonames\" "
13381323
"--challenge=\"append-no-conflicts\" --car=\"4gheap\" --client-options=\"timeout:240\" "
1339-
"--user-tag=\"name:geonames-4g,setup:docker-oss,race-configs-id:{},license:oss\" --runtime-jdk=\"8\" "
1340-
"--car-params=\"{{\\\"verbose_iw_logging_enabled\\\": \\\"true\\\", \\\"additional_cluster_settings\\\": "
1324+
"--user-tag=\"name:geonames-4g,setup:docker-oss,race-configs-id:{},license:oss\" "
1325+
"--runtime-jdk=\"8\" --distribution-version=\"5.6.0\" "
1326+
"--pipeline=\"docker\" --car-params=\"{{\\\"additional_cluster_settings\\\": "
13411327
"{{\\\"xpack.security.enabled\\\": \\\"false\\\", \\\"xpack.ml.enabled\\\": \\\"false\\\", "
1342-
"\\\"xpack.monitoring.enabled\\\": \\\"false\\\", \\\"xpack.watcher.enabled\\\": \\\"false\\\"}}}}\" "
1343-
"--distribution-version=\"5.6.0\" --pipeline=\"docker\"".format(race_configs_id),
1328+
"\\\"xpack.monitoring.enabled\\\": \\\"false\\\", "
1329+
"\\\"xpack.watcher.enabled\\\": \\\"false\\\"}}}}\"".format(race_configs_id),
13441330
]
13451331
,
13461332
system_call.calls

0 commit comments

Comments
 (0)