Skip to content

Commit 33d3873

Browse files
committed
CI: remove Async default device configuration
We are right now defaulting to use Async (io_uring) for any test that does not explicitly sets a device engine. That can lead to regressions (performance or otherwise) getting obfuscated for the Sync engine (which is actually the only drive engine that is currently GA). Signed-off-by: Diana Popa <[email protected]>
1 parent e09a1fe commit 33d3873

File tree

2 files changed

+3
-16
lines changed

2 files changed

+3
-16
lines changed

tests/framework/microvm.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -533,9 +533,7 @@ def spawn(
533533
self.mmds = MMDS(self._api_socket, self._api_session)
534534
self.network = Network(self._api_socket, self._api_session)
535535
self.snapshot = SnapshotHelper(self._api_socket, self._api_session)
536-
self.drive = Drive(
537-
self._api_socket, self._api_session, self.firecracker_version
538-
)
536+
self.drive = Drive(self._api_socket, self._api_session)
539537
self.vm = Vm(self._api_socket, self._api_session)
540538
self.vsock = Vsock(self._api_socket, self._api_session)
541539

tests/framework/resources.py

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import urllib
66
import re
77

8-
from framework.utils import compare_versions, is_io_uring_supported, run_cmd
8+
from framework.utils import compare_versions, run_cmd
99
from framework.defs import API_USOCKET_URL_PREFIX
1010

1111

@@ -164,27 +164,16 @@ class Drive:
164164

165165
DRIVE_CFG_RESOURCE = "drives"
166166

167-
def __init__(self, api_usocket_full_name, api_session, firecracker_version):
167+
def __init__(self, api_usocket_full_name, api_session):
168168
"""Specify the information needed for sending API requests."""
169169
url_encoded_path = urllib.parse.quote_plus(api_usocket_full_name)
170170
api_url = API_USOCKET_URL_PREFIX + url_encoded_path + "/"
171171

172172
self._drive_cfg_url = api_url + self.DRIVE_CFG_RESOURCE
173173
self._api_session = api_session
174-
self._firecracker_version = firecracker_version
175174

176175
def put(self, **args):
177176
"""Attach a block device or update the details of a previous one."""
178-
# Default the io engine to Async on kernels > 5.10 so that we
179-
# make sure to exercise both Sync and Async behaviour in the CI.
180-
# Also check the FC version to make sure that it has support for
181-
# configurable io_engine.
182-
if (
183-
is_io_uring_supported()
184-
and compare_versions(self._firecracker_version, "0.25.0") > 0
185-
and ("io_engine" not in args or args["io_engine"] is None)
186-
):
187-
args["io_engine"] = "Async"
188177

189178
datax = self.create_json(**args)
190179

0 commit comments

Comments
 (0)