You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by "peloyeje (via GitHub)" <gi...@apache.org> on 2024/07/17 12:24:02 UTC

[PR] Fix overriden base container name not used to fetch logs on KPO trigger_reentry [airflow]

peloyeje opened a new pull request, #40835:
URL: https://github.com/apache/airflow/pull/40835

   
   <!--
    Licensed to the Apache Software Foundation (ASF) under one
    or more contributor license agreements.  See the NOTICE file
    distributed with this work for additional information
    regarding copyright ownership.  The ASF licenses this file
    to you under the Apache License, Version 2.0 (the
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
   
      http://www.apache.org/licenses/LICENSE-2.0
   
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
    KIND, either express or implied.  See the License for the
    specific language governing permissions and limitations
    under the License.
    -->
   
   <!--
   Thank you for contributing! Please make sure that your code changes
   are covered with tests. And in case of new features or big changes
   remember to adjust the documentation.
   
   Feel free to ping committers for the review!
   
   In case of an existing issue, reference it using one of the following:
   
   closes: #ISSUE
   related: #ISSUE
   
   How to write a good git commit message:
   http://chris.beams.io/posts/git-commit/
   -->
   
   
   Ensures that self.pod_manager.fetch_container_logs use instance-level self.base_container_name instead of BASE_CONTAINER_NAME.
   Fixes log fetching when base container name is provided
   Also attempts at simplifying the assignment logic for self.container_logs in the init
   <!-- Please keep an empty line above the dashes. -->
   ---
   **^ Add meaningful description above**
   Read the **[Pull Request Guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#pull-request-guidelines)** for more information.
   In case of fundamental code changes, an Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvement+Proposals)) is needed.
   In case of a new dependency, check compliance with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x).
   In case of backwards incompatible changes please leave a note in a newsfragment file, named `{pr_number}.significant.rst` or `{issue_number}.significant.rst`, in [newsfragments](https://github.com/apache/airflow/tree/main/newsfragments).
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Fix overriden base container name not used to fetch logs on KPO trigger_reentry [airflow]

Posted by "peloyeje (via GitHub)" <gi...@apache.org>.
peloyeje commented on PR #40835:
URL: https://github.com/apache/airflow/pull/40835#issuecomment-2239316177

   Static checks fixed


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Fix overriden base container name not used to fetch logs on KPO trigger_reentry [airflow]

Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] closed pull request #40835: Fix overriden base container name not used to fetch logs on KPO trigger_reentry
URL: https://github.com/apache/airflow/pull/40835


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Fix overriden base container name not used to fetch logs on KPO trigger_reentry [airflow]

Posted by "peloyeje (via GitHub)" <gi...@apache.org>.
peloyeje commented on code in PR #40835:
URL: https://github.com/apache/airflow/pull/40835#discussion_r1703244897


##########
airflow/providers/cncf/kubernetes/operators/pod.py:
##########
@@ -353,9 +352,9 @@ def __init__(
         self.cluster_context = cluster_context
         self.reattach_on_restart = reattach_on_restart
         self.get_logs = get_logs
-        self.container_logs = container_logs
-        if self.container_logs == KubernetesPodOperator.BASE_CONTAINER_NAME:
-            self.container_logs = base_container_name or self.BASE_CONTAINER_NAME
+        self.base_container_name = base_container_name or self.BASE_CONTAINER_NAME

Review Comment:
   Done, sorry for the delay.
   Thanks for the review @hussein-awala!



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Fix overriden base container name not used to fetch logs on KPO trigger_reentry [airflow]

Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #40835:
URL: https://github.com/apache/airflow/pull/40835#issuecomment-2359659601

   This pull request has been automatically marked as stale because it has not had recent activity. It will be closed in 5 days if no further activity occurs. Thank you for your contributions.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Fix overriden base container name not used to fetch logs on KPO trigger_reentry [airflow]

Posted by "hussein-awala (via GitHub)" <gi...@apache.org>.
hussein-awala commented on code in PR #40835:
URL: https://github.com/apache/airflow/pull/40835#discussion_r1686189229


##########
airflow/providers/cncf/kubernetes/operators/pod.py:
##########
@@ -353,9 +352,9 @@ def __init__(
         self.cluster_context = cluster_context
         self.reattach_on_restart = reattach_on_restart
         self.get_logs = get_logs
-        self.container_logs = container_logs
-        if self.container_logs == KubernetesPodOperator.BASE_CONTAINER_NAME:
-            self.container_logs = base_container_name or self.BASE_CONTAINER_NAME
+        self.base_container_name = base_container_name or self.BASE_CONTAINER_NAME

Review Comment:
   You can change the default value of `base_container_name` to `BASE_CONTAINER_NAME` and remove this line



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Fix overriden base container name not used to fetch logs on KPO trigger_reentry [airflow]

Posted by "peloyeje (via GitHub)" <gi...@apache.org>.
peloyeje commented on PR #40835:
URL: https://github.com/apache/airflow/pull/40835#issuecomment-2233224044

   Will fix static checks asap


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] Fix overriden base container name not used to fetch logs on KPO trigger_reentry [airflow]

Posted by "eladkal (via GitHub)" <gi...@apache.org>.
eladkal commented on code in PR #40835:
URL: https://github.com/apache/airflow/pull/40835#discussion_r1702073563


##########
airflow/providers/cncf/kubernetes/operators/pod.py:
##########
@@ -353,9 +352,9 @@ def __init__(
         self.cluster_context = cluster_context
         self.reattach_on_restart = reattach_on_restart
         self.get_logs = get_logs
-        self.container_logs = container_logs
-        if self.container_logs == KubernetesPodOperator.BASE_CONTAINER_NAME:
-            self.container_logs = base_container_name or self.BASE_CONTAINER_NAME
+        self.base_container_name = base_container_name or self.BASE_CONTAINER_NAME

Review Comment:
   @peloyeje can you handle the above comment?



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org