Skip to content
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

issue: 4207369: EOFError while extracting logs #288

Merged
merged 4 commits into from
Dec 19, 2024
Merged

issue: 4207369: EOFError while extracting logs #288

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e501ef1
handle error
Miryam-Schwartz Dec 19, 2024
e5827e5
fix comments, pylint and ruff
Miryam-Schwartz Dec 19, 2024
f262323
fix comments, pylint and ruff
Miryam-Schwartz Dec 19, 2024
6cb2e29
fix comments, pylint and ruff
Miryam-Schwartz Dec 19, 2024
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
29 changes: 19 additions & 10 deletions plugins/ufm_log_analyzer_plugin/src/loganalyze/logs_extraction/tar_extractor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ def _get_files_from_tar(
failed_extract = set()
folders_to_remove = set()
single_log_name, logs_with_dirs = self._split_based_on_dir(files_to_extract)

for member in opened_file:
base_name = os.path.basename(member.name)
full_dir_path = os.path.dirname(member.name)
Expand Down Expand Up @@ -128,17 +129,25 @@ def extract_files(
inner_file_open_mode = (
"r:gz" if self.is_gzip_file_obj(inner_tar_stream) else "r:"
)
with tarfile.open(
fileobj=inner_tar_stream, mode=inner_file_open_mode
) as inner_tar:
extracted_files, failed_files = self._get_files_from_tar(
inner_tar,
files_to_extract,
directories_to_extract,
destination,

try:
with tarfile.open(
fileobj=inner_tar_stream, mode=inner_file_open_mode
) as inner_tar:
extracted_files, failed_files = self._get_files_from_tar(
inner_tar,
files_to_extract,
directories_to_extract,
destination,
)
if len(extracted_files) > 0:
return extracted_files, failed_files

except EOFError as e:
log.LOGGER.info(
"EOFError in inner tar %s: %s", inner_tar_name, e
)
if len(extracted_files) > 0:
return extracted_files, failed_files
continue
# If we got to this point, we might have a simple tar, try to extract from it
return self._get_files_from_tar(
outer_tar, files_to_extract, directories_to_extract, destination
Expand Down