Skip to content

api: make version checks more generic #53

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.

Sign up for GitHub

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

Open
mikechristie wants to merge 2 commits into
base: master
Choose a base branch
from
Open

api: make version checks more generic #53

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdf78b1
drop OS and kernel check in pre_reqs_errors
Mar 30, 2018
66f7391
Return detail error during lun creation
Mar 30, 2018
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
69 changes: 22 additions & 47 deletions rbd-target-api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
from rpm import labelCompare
import rados

import pkg_resources

@dillaman dillaman Mar 30, 2018

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to add python-setuptools to spec Requires section


import werkzeug
from flask import Flask, jsonify, make_response, request
from rtslib_fb.utils import RTSLibError, normalize_wwn
Expand All @@ -28,7 +30,7 @@
from ceph_iscsi_config.client import GWClient, CHAP
from ceph_iscsi_config.common import Config
from ceph_iscsi_config.utils import (get_ip, this_host, ipv4_addresses,
gen_file_hash, valid_rpm)
gen_file_hash)

from gwcli.utils import (this_host, APIRequest, valid_gateway,
valid_disk, valid_client, GatewayAPIError)
Expand Down Expand Up @@ -729,7 +731,7 @@ def _disk(image_id):
lun.allocate()
if lun.error:
logger.error("LUN alloc problem - {}".format(lun.error_msg))
return jsonify(message="LUN allocation failure"), 500
return jsonify(message=lun.error_msg), 500

if request.form['mode'] == 'create':
# new disk is allocated, so refresh the local config object
Expand Down Expand Up @@ -1453,57 +1455,30 @@ def call_api(gateway_list, endpoint, element, http_method='put', api_vars=None):

def pre_reqs_errors():
"""
function to check pre-req rpms are installed and at the relevant versions
function to check pre-req packages are installed and at the relevant version

:return: list of configuration errors detected
"""

valid_dists = ["redhat"]
valid_versions = ['7.4']

required_rpms = [
{"name": "python-rtslib",
"version": "2.1.fb64",
"release": "0.1"},
{"name": "tcmu-runner",
"version": "1.3.0",
"release": "0.2.3"}
]

k_vers = '3.10.0'
k_rel = '823.el7'

errors_found = []
required_pkgs = [
{"name": "rtslib_fb",
"version": "2.1.64"},
{"name": "ceph_iscsi_config",
"version": "2.3"}
]

dist, rel, dist_id = platform.linux_distribution(full_distribution_name=0)

if dist.lower() in valid_dists:
if rel not in valid_versions:
errors_found.append("OS version is unsupported")

# check rpm versions are OK
for rpm in required_rpms:
if not valid_rpm(rpm):
logger.error("RPM check for {} failed")
errors_found.append("{} rpm must be installed at >= "
"{}-{}".format(rpm['name'],
rpm['version'],
rpm['release']))
else:
errors_found.append("OS is unsupported")

# check the running kernel is OK (required kernel has patches to rbd.ko)
os_info = os.uname()
this_arch = os_info[-1]
this_kernel = os_info[2].replace(".{}".format(this_arch), '')
this_ver, this_rel = this_kernel.split('-', 1)

# use labelCompare from the rpm module to handle the comparison
if labelCompare(('1', this_ver, this_rel), ('1', k_vers, k_rel)) < 0:
logger.error("Kernel version check failed")
errors_found.append("Kernel version too old - {}-{} "
"or above needed".format(k_vers,
k_rel))
# We only check these 2 because ceph-iscsi-config via rtslib will check
# the kernel and tcmu-runner have support for the needed features we
# require dynamically. We can then more easily support distro kernels
# with backported tcmu patches.

for pkg in required_pkgs:
version_str = pkg_resources.require(pkg['name'])[0].version

@dillaman dillaman Mar 30, 2018

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can throw an exception. In my CentOS distro, rtslib_fb throws an error about python-pyudev being too old (due to the requirements in the package). It will also throw if the package isn't installed.

@mikechristie mikechristie Mar 30, 2018

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. Will add exception handling and do more testing with combos of installed/uninstalled packages.

version = pkg_resources.parse_version(version_str)
if version < pkg_resources.parse_version(pkg['version']):
errors_found.append("Found {} {}. {} or newer required.".format(
pkg['name'], version_str, pkg['version']))

return errors_found

Expand Down