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.

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

3.7.6.8 #127

Merged
merged 42 commits into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
ad666d1
New version
PalNilsson May 8, 2024
01a7693
Debug info for write_json()
PalNilsson May 8, 2024
c90726f
Corrected problem with handling write_json() return type
May 9, 2024
6622dc1
Updated cpu_arch handling
PalNilsson May 10, 2024
6b3b331
Aborting cvmfs check if env var set
PalNilsson May 10, 2024
c8da852
pylint changes
May 14, 2024
21e5bc3
pylint changes
May 14, 2024
8394e28
Changed annoying log message from info to debug
May 14, 2024
9c695c0
Removed running state requirement leading to lost heartbeat
May 14, 2024
c0053a5
Pylint changes
PalNilsson May 14, 2024
48f089a
Pylint changes
PalNilsson May 14, 2024
5597a42
Pylint updates
May 15, 2024
8613fac
Pylint changes
PalNilsson May 17, 2024
0dccf74
Pylint changes
PalNilsson May 17, 2024
032bec8
Pylint updates
May 17, 2024
ccca637
Pylint changes
PalNilsson May 17, 2024
476fa9a
Pylint changes
PalNilsson May 17, 2024
b4f76be
Pylint changes
PalNilsson May 17, 2024
367a0cd
Merge remote-tracking branch 'origin/next' into next
PalNilsson May 17, 2024
89f976f
Pylint updates
May 17, 2024
4e06c37
Pylint updates
May 17, 2024
9f60274
Pylint updates
May 17, 2024
672c395
Pylint updates
May 17, 2024
692954a
Pylint updates
May 17, 2024
986a789
Pylint updates
May 17, 2024
7c89a7f
Pylint updates
May 17, 2024
b296ea7
Pylint updates
May 17, 2024
80d0b19
Pylint updates
May 17, 2024
112705f
Version update
May 17, 2024
2e2593c
Updated comments
May 17, 2024
01877f6
Pylint updates
May 20, 2024
deb831b
Pydocstyle update
May 20, 2024
49b6a67
Black updates
May 20, 2024
09aef38
Pylint updates (W0102 warning)
May 20, 2024
a6a0c21
Pylint updates
May 20, 2024
5e62d2a
Pylint updates
May 20, 2024
d67cfb5
Pylint updates
May 20, 2024
39e981e
Version update
May 20, 2024
5fd9db3
Added error_report
May 22, 2024
eaf3f18
Support for error report
May 22, 2024
42ed3e8
Changed _errorCode to _error_code
PalNilsson May 29, 2024
94041bc
Dropped python 3.8 support since unittests now start to fail due to m…
PalNilsson May 29, 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
2 changes: 1 addition & 1 deletion .github/workflows/flake8-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11"]
python-version: ["3.9", "3.10", "3.11"]
env:
FLAKE8_VERSION: "==6.1.0"
FLAKE8_CONFIG: ".flake8"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
continue-on-error: true
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11']
python-version: ['3.9', '3.10', '3.11']
steps:
- name: Checkout Pilot3 repo
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion PILOTVERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.7.5.4
3.7.6.8
19 changes: 0 additions & 19 deletions doc/components/api/benchmark.rst

This file was deleted.

3 changes: 1 addition & 2 deletions doc/components/api/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
http://www.apache.org/licenses/LICENSE-2.0

Authors:
- Paul Nilsson, [email protected], 2017-2018
- Paul Nilsson, [email protected], 2017-2024

api components
==============
Expand All @@ -16,7 +16,6 @@ api components
:maxdepth: 2

analytics
benchmark
data
memorymonitor
services
51 changes: 35 additions & 16 deletions pilot.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
# under the License.
#
# Authors:
# - Mario Lassnig, [email protected], 2016-17
# - Mario Lassnig, [email protected], 2016-2017
# - Daniel Drizhuk, [email protected], 2017
# - Paul Nilsson, [email protected], 2017-24
# - Paul Nilsson, [email protected], 2017-2024

"""This is the entry point for the PanDA Pilot, executed with 'python3 pilot.py <args>'."""

Expand Down Expand Up @@ -121,19 +121,9 @@ def main() -> int:
) # note: assuming IPv6, fallback in place

# check cvmfs if available
is_available = is_cvmfs_available()
if is_available is None:
pass # ignore this case
elif is_available is True:
timestamp = get_last_update()
if timestamp and timestamp > 0:
logger.info('CVMFS has been validated')
else:
logger.warning('CVMFS is not responding - aborting pilot')
return errors.CVMFSISNOTALIVE
else:
logger.warning('CVMFS is not alive - aborting pilot')
return errors.CVMFSISNOTALIVE
ec = check_cvmfs(logger)
if ec:
return ec

if not args.rucio_host:
args.rucio_host = config.Rucio.host
Expand Down Expand Up @@ -202,6 +192,35 @@ def main() -> int:
return exitcode


def check_cvmfs(logger: Any) -> int:
"""
Check if cvmfs is available.

:param logger: logging object.
:return: exit code (int).
"""
# skip all tests if required
if os.environ.get("NO_CVMFS_OK", False):
logger.info("skipping cvmfs checks")
return 0

is_available = is_cvmfs_available()
if is_available is None:
pass # ignore this case
elif is_available is True:
timestamp = get_last_update()
if timestamp and timestamp > 0:
logger.info('CVMFS has been validated')
else:
logger.warning('CVMFS is not responding - aborting pilot')
return errors.CVMFSISNOTALIVE
else:
logger.warning('CVMFS is not alive - aborting pilot')
return errors.CVMFSISNOTALIVE

return 0


def str2bool(var: str) -> bool:
"""
Convert string to bool.
Expand Down Expand Up @@ -638,7 +657,7 @@ def create_main_work_dir() -> (int, str):
f"failed to create workdir at {_mainworkdir} -- aborting: {error}",
file=sys.stderr,
)
exitcode = shell_exit_code(error._errorCode)
exitcode = shell_exit_code(error._error_code)
else:
_mainworkdir = getcwd()

Expand Down
6 changes: 1 addition & 5 deletions pilot/api/analytics.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# under the License.
#
# Authors:
# - Paul Nilsson, [email protected], 2018-2023
# - Paul Nilsson, [email protected], 2018-2024

"""Functions for performing analytics including fitting of data."""

Expand Down Expand Up @@ -379,8 +379,6 @@ def chi2(self):
def set_slope(self):
"""
Calculate and set the slope of the linear fit.
:return:
"""
if self._ss2 and self._ss and self._ss != 0:
self._slope = self._ss2 / float(self._ss)
Expand All @@ -398,8 +396,6 @@ def slope(self):
def set_intersect(self):
"""
Calculate and set the intersect of the linear fit.
:return:
"""
if self._ym and self._slope and self._xm:
self._intersect = self._ym - self._slope * self._xm
Expand Down
39 changes: 0 additions & 39 deletions pilot/api/benchmark.py

This file was deleted.

Loading
Loading