Skip to content

FIX: Close file handles to prevent descriptor leaks in CI and media parser #1069

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
canihavesomecoffee merged 1 commit into from
Mar 19, 2026
Merged

FIX: Close file handles to prevent descriptor leaks in CI and media parser #1069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions mod_ci/controllers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1188,8 +1188,10 @@ def create_instance(compute, project, zone, test, reportURL) -> Dict:
if test.platform == TestPlatform.linux:
image_response = compute.images().getFromFamily(project=config.get('LINUX_INSTANCE_PROJECT_NAME', ''),
family=config.get('LINUX_INSTANCE_FAMILY_NAME', '')).execute()
startup_script = open(os.path.join(config.get('INSTALL_FOLDER', ''), 'install', 'ci-vm',
'ci-linux', 'startup-script.sh'), 'r').read()
with open(os.path.join(
config.get('INSTALL_FOLDER', ''), 'install', 'ci-vm',
'ci-linux', 'startup-script.sh'), 'r') as f:
startup_script = f.read()
metadata_items = [
{'key': 'startup-script', 'value': startup_script},
{'key': 'reportURL', 'value': reportURL},
Expand All @@ -1198,12 +1200,18 @@ def create_instance(compute, project, zone, test, reportURL) -> Dict:
elif test.platform == TestPlatform.windows:
image_response = compute.images().getFromFamily(project=config.get('WINDOWS_INSTANCE_PROJECT_NAME', ''),
family=config.get('WINDOWS_INSTANCE_FAMILY_NAME', '')).execute()
startup_script = open(os.path.join(config.get('INSTALL_FOLDER', ''), 'install', 'ci-vm',
'ci-windows', 'startup-script.ps1'), 'r').read()
service_account = open(os.path.join(config.get('INSTALL_FOLDER', ''),
config.get('SERVICE_ACCOUNT_FILE', '')), 'r').read()
rclone_conf = open(os.path.join(config.get('INSTALL_FOLDER', ''), 'install', 'ci-vm',
'ci-windows', 'rclone.conf'), 'r').read()
with open(os.path.join(
config.get('INSTALL_FOLDER', ''), 'install', 'ci-vm',
'ci-windows', 'startup-script.ps1'), 'r') as f:
startup_script = f.read()
with open(os.path.join(
config.get('INSTALL_FOLDER', ''),
config.get('SERVICE_ACCOUNT_FILE', '')), 'r') as f:
service_account = f.read()
with open(os.path.join(
config.get('INSTALL_FOLDER', ''), 'install', 'ci-vm',
'ci-windows', 'rclone.conf'), 'r') as f:
rclone_conf = f.read()
metadata_items = [
{'key': 'windows-startup-script-ps1', 'value': startup_script},
{'key': 'service_account', 'value': service_account},
Expand Down
6 changes: 3 additions & 3 deletions mod_sample/media_info_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,10 +210,10 @@ def generate_media_xml(sample) -> MediaInfoFetcher:

media_folder = os.path.join(config.get('SAMPLE_REPOSITORY', ''), 'TestFiles')
media_info_path = os.path.join(media_folder, 'media', sample.sha + '.xml')
output_handle = open(media_info_path, 'w')
media_path = os.path.join(media_folder, sample.filename)
process = subprocess.Popen(['mediainfo', '--Output=XML', media_path], stdout=output_handle)
process.wait()
with open(media_info_path, 'w') as output_handle:
process = subprocess.Popen(['mediainfo', '--Output=XML', media_path], stdout=output_handle)
process.wait()
if os.path.isfile(media_info_path):
# Load media info, and replace full pathname
tree = etree.parse(media_info_path)
Expand Down
Loading