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

Fix: Exception when parsing log #20966 #21053

Closed
wants to merge 11 commits into from
Closed

Fix: Exception when parsing log #20966 #21053

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
61fb761
UnicodeDecodeError: 'utf-8' codec can't decode byte 0xXX in position …
microhuang Jan 14, 2022
f9cb490
Update subprocess.py
microhuang Jan 14, 2022
c99da1a
Merge branch 'apache:main' into main
microhuang Jan 14, 2022
d817864
Update subprocess.py
microhuang Jan 15, 2022
e059fed
Merge branch 'apache:main' into main
microhuang Jan 15, 2022
4b736e5
Merge branch 'apache:main' into main
microhuang Jan 24, 2022
a0deb63
Fix: Exception when parsing log #20966
microhuang Jan 24, 2022
8531a44
Fix: Exception when parsing log #20966
microhuang Jan 24, 2022
7eb1387
Create test_subprocess.sh
microhuang Jan 24, 2022
347bcc8
Update test_subprocess.py
microhuang Jan 24, 2022
ac78c4e
Merge branch 'apache:main' into main
microhuang Jan 25, 2022
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
2 changes: 1 addition & 1 deletion airflow/hooks/subprocess.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def pre_exec():
raise RuntimeError("The subprocess should be created here and is None!")
if self.sub_process.stdout is not None:
for raw_line in iter(self.sub_process.stdout.readline, b''):
line = raw_line.decode(output_encoding).rstrip()
line = raw_line.decode(output_encoding, errors='backslashreplace').rstrip()
self.log.info("%s", line)

self.sub_process.wait()
Expand Down
3 changes: 2 additions & 1 deletion airflow/providers/cncf/kubernetes/utils/pod_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,8 @@ def follow_logs(since_time: Optional[DateTime] = None) -> Optional[DateTime]:
),
)
for line in logs:
timestamp, message = self.parse_log_line(line.decode('utf-8'))
line = line.decode('utf-8', errors="backslashreplace")
timestamp, message = self.parse_log_line(line)
self.log.info(message)
Comment on lines 201 to 204
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

                for raw_line in logs:
                    line = raw_line.decode('utf-8', errors="backslashreplace")
                    timestamp, message = self.parse_log_line(line)

except BaseHTTPError: # Catches errors like ProtocolError(TimeoutError).
self.log.warning(
Expand Down