Ignore XFS mountpoints in CageFS skeleton #84
Conversation
Thank you for contributing to the Leapp project!Please note that every PR needs to comply with the Leapp Guidelines and must pass all tests in order to be mergable.
Please open ticket in case you experience technical problem with the CI. (RH internal only) Note: In case there are problems with tests not being triggered automatically on new PR/commit or pending for a long time, please consider rerunning the CI by commenting leapp-ci build (might require several comments). If the problem persists, contact leapp-infra. |
| return False | ||
| try: | ||
| for l in run(['/usr/sbin/xfs_info', '{}'.format(mp)], split=True)['stdout']: | ||
| if 'ftype=0' in l: |
There was a problem hiding this comment.
maybe just return any('ftype=0' in line for line in run(['/usr/sbin/xfs_info', '{}'.format(mp)], split=True)['stdout'])
| if 'ftype=0' in l: | ||
| return True | ||
| return False | ||
| # xfs_info can sometimes throw errors like the following if fed a CageFS mountpoint. |
There was a problem hiding this comment.
maybe better write "like the following one if it's given a CageFS mountpoint."
| # xfs_info can sometimes throw errors like the following if fed a CageFS mountpoint. | ||
| # xfs_info: /usr/share/cagefs-skeleton/var/www/cgi-bin\040(deleted) is not a mounted XFS filesystem | ||
| except CalledProcessError as err: | ||
| if "cagefs" in mp: |
There was a problem hiding this comment.
What if there is an invalid cagefs mount (let's say specified in cagefs.mp file) without cagefs in path? We are going to stop the elevation process and expecting customer to handle such a case by himself?
Meh |
CloudLinux CageFS mountpoints can sometimes cause problems with the XFS scanner actor. An example:
CageFS mountpoints causing problems with the xfs_info utility can be safely skipped over instead of halting the actor and the upgrade process.