Repository: incubator-airflow Updated Branches: refs/heads/master 1db307337 -> 06b62c42b
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/06b62c42/airflow/contrib/task_runner/cgroup_task_runner.py ---------------------------------------------------------------------- diff --git a/airflow/contrib/task_runner/cgroup_task_runner.py b/airflow/contrib/task_runner/cgroup_task_runner.py index 0302802..a97eac2 100644 --- a/airflow/contrib/task_runner/cgroup_task_runner.py +++ b/airflow/contrib/task_runner/cgroup_task_runner.py @@ -7,9 +7,9 @@ # 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 @@ -113,7 +113,8 @@ class CgroupTaskRunner(BaseTaskRunner): cgroups = self._get_cgroup_names() if cgroups["cpu"] != "/" or cgroups["memory"] != "/": self.log.debug( - "Already running in a cgroup (cpu: %s memory: %s) so not creating another one", + "Already running in a cgroup (cpu: %s memory: %s) so not " + "creating another one", cgroups.get("cpu"), cgroups.get("memory") ) self.process = self.run_command(['bash', '-c'], join_args=True) @@ -174,9 +175,9 @@ class CgroupTaskRunner(BaseTaskRunner): # we might want to revisit that approach at some other point. if return_code == 137: self.log.warning("Task failed with return code of 137. This may indicate " - "that it was killed due to excessive memory usage. " - "Please consider optimizing your task or using the " - "resources argument to reserve more memory for your task") + "that it was killed due to excessive memory usage. " + "Please consider optimizing your task or using the " + "resources argument to reserve more memory for your task") return return_code def terminate(self): http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/06b62c42/airflow/contrib/utils/__init__.py ---------------------------------------------------------------------- diff --git a/airflow/contrib/utils/__init__.py b/airflow/contrib/utils/__init__.py index f0f8b68..114d189 100644 --- a/airflow/contrib/utils/__init__.py +++ b/airflow/contrib/utils/__init__.py @@ -7,13 +7,12 @@ # 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. -
