fix oss key prefix bug in oss_task_handler (apache#39627)

romsharon98 · Jul 26, 2024 · 3516005 · 3516005
1 parent 37977be
commit 3516005
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/airflow/providers/alibaba/cloud/log/oss_task_handler.py b/airflow/providers/alibaba/cloud/log/oss_task_handler.py
@@ -172,7 +172,7 @@ def oss_write(self, log, remote_log_location, append=True) -> bool:
         """
         oss_remote_log_location = f"{self.base_folder}/{remote_log_location}"
         pos = 0
-        if append and self.oss_log_exists(oss_remote_log_location):
+        if append and self.oss_log_exists(remote_log_location):
             head = self.hook.head_key(self.bucket_name, oss_remote_log_location)
             pos = head.content_length
         self.log.info("log write pos is: %s", pos)

diff --git a/tests/providers/alibaba/cloud/log/test_oss_task_handler.py b/tests/providers/alibaba/cloud/log/test_oss_task_handler.py
@@ -98,7 +98,7 @@ def test_oss_write_into_remote_existing_file_via_append(self, mock_service, mock
         # Then
         assert mock_service.call_count == 2
         mock_service.return_value.head_key.assert_called_once_with(MOCK_BUCKET_NAME, "airflow/logs/1.log")
-        mock_oss_log_exists.assert_called_once_with("airflow/logs/1.log")
+        mock_oss_log_exists.assert_called_once_with("1.log")
         mock_service.return_value.append_string.assert_called_once_with(
             MOCK_BUCKET_NAME, MOCK_CONTENT, "airflow/logs/1.log", 1
         )
@@ -115,7 +115,7 @@ def test_oss_write_into_remote_non_existing_file_via_append(self, mock_service,
         # Then
         assert mock_service.call_count == 1
         mock_service.return_value.head_key.assert_not_called()
-        mock_oss_log_exists.assert_called_once_with("airflow/logs/1.log")
+        mock_oss_log_exists.assert_called_once_with("1.log")
         mock_service.return_value.append_string.assert_called_once_with(
             MOCK_BUCKET_NAME, MOCK_CONTENT, "airflow/logs/1.log", 0
         )