External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-18 09:27:31 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9627 from jainnikhil30/fix_large_file_project_sync

Browse Source 
fix the large file parsing in project sync

SUMMARY
Fixes the issue of scm update stuck on reading large files because of islice trying to read the whole file.
ISSUE TYPE


Bugfix Pull Request

COMPONENT NAME


API

Reviewed-by: Ryan Petrello <None>
Reviewed-by: None <None>
This commit is contained in:
softwarefactory-project-zuul[bot]
2021-03-24 13:46:00 +00:00
committed by GitHub
parent 646c9cc708 60d6832971
commit 634d432de4
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
awx/main/utils/ansible.py
View File

@@ -6,7 +6,6 @@ import codecs
import re import re
import os import os
import logging import logging
from itertools import islice
from configparser import ConfigParser from configparser import ConfigParser
# Django # Django
@@ -82,14 +81,20 @@ def could_be_inventory(project_path, dir_path, filename):
# Filter files that do not use a character set consistent with # Filter files that do not use a character set consistent with
# Ansible inventory mainly # Ansible inventory mainly
matched = False
try: try:
# only read through first 10 lines for performance # only read through first 10 lines for performance
with codecs.open(inventory_path, 'r', encoding='utf-8', errors='ignore') as inv_file: with open(inventory_path, encoding='utf-8', errors='ignore') as inv_file:
for line in islice(inv_file, 10): for i, line in enumerate(inv_file):
if not valid_inventory_re.match(line): if i > 10:
return None break
elif valid_inventory_re.match(line):
matched = True
break
except IOError: except IOError:
return None return None
if not matched:
return None
return inventory_rel_path return inventory_rel_path