Change in vdsm[master]: adding compatibility for ovirt-engine 4.0 support
Eli Mesika has posted comments on this change. Change subject: adding compatibility for ovirt-engine 4.0 support .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/49060 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic0bf31758ad211f49582af4d6fb8b23adcd8b369 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Oved Ourfali Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: adding compatibility for ovirt-engine 4.0 support
Eli Mesika has posted comments on this change. Change subject: adding compatibility for ovirt-engine 4.0 support .. Patch Set 1: (1 comment) https://gerrit.ovirt.org/#/c/49060/1/vdsm/dsaversion.py.in File vdsm/dsaversion.py.in: Line 39: 'clusterLevels': ['3.4', '3.5', '3.6', '4.0'], Line 40: } Line 41: Line 42: if platform.machine() == 'ppc64le': Line 43: version_info['clusterLevels'] = ['3.6'] > should we add 4.0 here as well? Yes, IMO we support PPC from 3.6 -- To view, visit https://gerrit.ovirt.org/49060 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic0bf31758ad211f49582af4d6fb8b23adcd8b369 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Oved Ourfali Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: fencing: stop using a deprecated command
Eli Mesika has posted comments on this change. Change subject: fencing: stop using a deprecated command .. Patch Set 1: Code-Review+1 -- To view, visit http://gerrit.ovirt.org/24303 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia0e167e493412f95eda2325e0b028eb7c29c18bc Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg Gerrit-Reviewer: Douglas Schilling Landgraf Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: init: Normalize shutdown timeout
Eli Mesika has posted comments on this change. Change subject: init: Normalize shutdown timeout .. Patch Set 3: I don't think that a change from 2 to 10 sec will do a change since we are computing the host load in soft fencing and multiply it by 2 just to be on the safe side. However, I would not got for 30 or 60 seconds since in case that soft-fencing fails this means that HA VMs recovery will take more time. Please wait for Martin P input on that -- To view, visit http://gerrit.ovirt.org/26111 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5434caff5bc95e2a76345191dec9ce4e33070a57 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Alon Bar-Lev Gerrit-Reviewer: Antoni Segura Puimedon Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: init: Normalize shutdown timeout
Eli Mesika has posted comments on this change. Change subject: init: Normalize shutdown timeout .. Patch Set 3: Just reminding again that we want to prevent to enlarge recovery time for HA VMs , so , 10 sec is OK 30 or bigger is not and I think we should not wait for a longer time to VDSM since in case that soft-fencing fails this will be resulted with HA VMs that takes too long to run on a different host -- To view, visit http://gerrit.ovirt.org/26111 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5434caff5bc95e2a76345191dec9ce4e33070a57 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Alon Bar-Lev Gerrit-Reviewer: Antoni Segura Puimedon Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: return error when status cmd fail
Eli Mesika has uploaded a new change for review. Change subject: vdsm: return error when status cmd fail .. vdsm: return error when status cmd fail This patch fixes an issue in the case that status command fails. In that case, the code returned a 0 error code which masks the error message. To fix that, the real error code is returned in the case that the status is not 'on' or 'off' Change-Id: I9b076349e01412ef9757e3b3346d1dc17183bf84 Signed-off-by: emesika --- M vdsm/API.py 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/63/57463/1 diff --git a/vdsm/API.py b/vdsm/API.py index d7caa37..f3cfc41 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -1234,6 +1234,7 @@ return {'status': {'code': 1, 'message': out + err}} message = doneCode['message'] +ret = 0 if action == 'status': if rc == 0: power = 'on' @@ -1242,7 +1243,8 @@ else: power = 'unknown' message = out + err -return {'status': {'code': 0, 'message': message}, +ret = rc +return {'status': {'code': rc, 'message': message}, 'power': power} if rc != 0: message = out + err -- To view, visit https://gerrit.ovirt.org/57463 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9b076349e01412ef9757e3b3346d1dc17183bf84 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: return error when status cmd fail
Eli Mesika has posted comments on this change. Change subject: vdsm: return error when status cmd fail .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.ovirt.org/57463 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9b076349e01412ef9757e3b3346d1dc17183bf84 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Oved Ourfali Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: adding handling for NGN in osinfo.py
Eli Mesika has uploaded a new change for review. Change subject: vdsm: adding handling for NGN in osinfo.py .. vdsm: adding handling for NGN in osinfo.py Current osinfo.py implementation lacks handling for NGN (New Generation Node). In case of NGN we have to return the following fields for OS information: NAME -> name VERSION -> version VARIANT -> release For example 'Centos - 7 (core) - oVirt Node 4.0.0_master' This patch does the following changes; 1. Add OVIRT_NGN = 'oVirt Next Generation Node' constant into OSName class 2. Modify_release_name() method to return OSName.OVIRT_NGN if /etc/os-release file exists 3. Add _parse_ngn_version() method to create version dict from /usr/lib/os.release.d/ovirt-release-host-node 4. Add OVIRT_NGN parsing into version() method Change-Id: I17337643cd4e986c09b07137d80da3555161ee70 Signed-off-by: emesika --- M lib/vdsm/osinfo.py 1 file changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/20/57620/1 diff --git a/lib/vdsm/osinfo.py b/lib/vdsm/osinfo.py index 8ad99a1..4c03b76 100644 --- a/lib/vdsm/osinfo.py +++ b/lib/vdsm/osinfo.py @@ -52,6 +52,7 @@ class OSName: UNKNOWN = 'unknown' OVIRT = 'oVirt Node' +OVIRT_NGN = 'oVirt New Generation Node' RHEL = 'RHEL' FEDORA = 'Fedora' RHEVH = 'RHEV Hypervisor' @@ -92,6 +93,8 @@ def _release_name(): if os.path.exists('/etc/rhev-hypervisor-release'): return OSName.RHEVH +elif os.path.exists('/etc/os-release'): +return OSName.OVIRT_NGN elif glob.glob('/etc/ovirt-node-*-release'): return OSName.OVIRT elif os.path.exists('/etc/fedora-release'): @@ -118,6 +121,22 @@ data[key] = value return data.get('VERSION', ''), data.get('RELEASE', '') +def _parse_ngn_version(path): +data = {} +with open(path) as f: +for line in f: +try: +key, value = [kv.strip() for kv in line.split('=', 1)] +except ValueError: +continue + +data[key] = value + +return ( +data.get('NAME', '').replace('"',''), +data.get('VERSION', '').replace('"',''), +data.get('VARIANT', '').replace('"','') +) @utils.memoized @@ -134,6 +153,8 @@ try: if osname == OSName.RHEVH or osname == OSName.OVIRT: version, release_name = _parse_node_version('/etc/default/version') +elif osname == OSName.OVIRT_NGN: +osname, version, release_name = _parse_ngn_version('/etc/os-release') elif osname == OSName.DEBIAN: version = linecache.getline('/etc/debian_version', 1).strip("\n") release_name = "" # Debian just has a version entry -- To view, visit https://gerrit.ovirt.org/57620 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I17337643cd4e986c09b07137d80da3555161ee70 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: adding handling for NGN in osinfo.py
Eli Mesika has posted comments on this change. Change subject: vdsm: adding handling for NGN in osinfo.py .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.ovirt.org/57620 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I17337643cd4e986c09b07137d80da3555161ee70 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: adding handling for NGN in osinfo.py
Eli Mesika has posted comments on this change. Change subject: vdsm: adding handling for NGN in osinfo.py .. Patch Set 3: Verified+1 -- To view, visit https://gerrit.ovirt.org/57620 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I17337643cd4e986c09b07137d80da3555161ee70 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Oved Ourfali Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: adding handling for NGN in osinfo.py
Eli Mesika has posted comments on this change. Change subject: vdsm: adding handling for NGN in osinfo.py .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/57620 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I17337643cd4e986c09b07137d80da3555161ee70 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Oved Ourfali Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: adding handling for NGN in osinfo.py
Eli Mesika has posted comments on this change. Change subject: vdsm: adding handling for NGN in osinfo.py .. Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/57620 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I17337643cd4e986c09b07137d80da3555161ee70 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Oved Ourfali Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: adding handling for NGN in osinfo.py
Eli Mesika has posted comments on this change. Change subject: vdsm: adding handling for NGN in osinfo.py .. Patch Set 5: -Code-Review Verified+1 -- To view, visit https://gerrit.ovirt.org/57620 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I17337643cd4e986c09b07137d80da3555161ee70 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Oved Ourfali Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.6]: vdsm: return error when status cmd fail
Eli Mesika has posted comments on this change. Change subject: vdsm: return error when status cmd fail .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/57641 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9b076349e01412ef9757e3b3346d1dc17183bf84 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: adding handling for NGN in osinfo.py
Eli Mesika has posted comments on this change. Change subject: vdsm: adding handling for NGN in osinfo.py .. Patch Set 5: (2 comments) https://gerrit.ovirt.org/#/c/57620/5/lib/vdsm/osinfo.py File lib/vdsm/osinfo.py: Line 92: @utils.memoized Line 93: def _release_name(): Line 94: if os.path.exists('/etc/rhev-hypervisor-release'): Line 95: return OSName.RHEVH Line 96: elif os.path.exists('/etc/os-release'): > /etc/os-release is a generic file present on all recent distributions. It d Done Line 97: return OSName.OVIRT_NGN Line 98: elif glob.glob('/etc/ovirt-node-*-release'): Line 99: return OSName.OVIRT Line 100: elif os.path.exists('/etc/fedora-release'): Line 147: osname = _release_name() Line 148: try: Line 149: if osname == OSName.RHEVH or osname == OSName.OVIRT: Line 150: version, release_name = _parse_node_version('/etc/default/version') Line 151: elif osname == OSName.OVIRT_NGN: > It's fine for me if you want to go this route :) done 1) Line 152: osname, version, release_name = _parse_ngn_version('/etc/os-release') Line 153: elif osname == OSName.DEBIAN: Line 154: version = linecache.getline('/etc/debian_version', 1).strip("\n") Line 155: release_name = "" # Debian just has a version entry -- To view, visit https://gerrit.ovirt.org/57620 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I17337643cd4e986c09b07137d80da3555161ee70 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Fabian Deutsch Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Oved Ourfali Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: adding handling for NGN in osinfo.py
Eli Mesika has posted comments on this change. Change subject: vdsm: adding handling for NGN in osinfo.py .. Patch Set 7: Verified+1 -- To view, visit https://gerrit.ovirt.org/57620 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I17337643cd4e986c09b07137d80da3555161ee70 Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Fabian Deutsch Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Oved Ourfali Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: adding handling for NGN in osinfo.py
Eli Mesika has posted comments on this change. Change subject: vdsm: adding handling for NGN in osinfo.py .. Patch Set 7: (2 comments) https://gerrit.ovirt.org/#/c/57620/7/lib/vdsm/osinfo.py File lib/vdsm/osinfo.py: Line 124: Line 125: def _parse_ngn_version(path, data): Line 126: return tuple( Line 127: [ Line 128: data.get(k, '').replace('"', '') > Hmm, maybe using strip('"') instead of replace is better idea, because it d Done Line 129: for k in 'NAME', 'VERSION_ID', 'VARIANT' Line 130: ] Line 131: ) Line 132: Line 141: OS_RELEASE_FILE = '/etc/os-release' Line 142: version = release_name = '' Line 143: data = None Line 144: if os.path.exists(OS_RELEASE_FILE): Line 145: data = get_data(OS_RELEASE_FILE) > Wouldn't it be more readable to do NGN check here: seems better to me to keep it inside the try block and not device the logic to 2 places ... Line 146: osname = _release_name() Line 147: try: Line 148: if osname == OSName.RHEVH or osname == OSName.OVIRT: Line 149: version, release_name = _parse_node_version('/etc/default/version') -- To view, visit https://gerrit.ovirt.org/57620 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I17337643cd4e986c09b07137d80da3555161ee70 Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Fabian Deutsch Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Oved Ourfali Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: adding handling for NGN in osinfo.py
Eli Mesika has posted comments on this change. Change subject: vdsm: adding handling for NGN in osinfo.py .. Patch Set 8: Verified+1 -- To view, visit https://gerrit.ovirt.org/57620 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I17337643cd4e986c09b07137d80da3555161ee70 Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Fabian Deutsch Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Oved Ourfali Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: adding support for version 4.1
Eli Mesika has uploaded a new change for review. Change subject: vdsm: adding support for version 4.1 .. vdsm: adding support for version 4.1 Change-Id: I7aaaf4d6ebf6c1e0fdcb37a158993a7b84c7f06d Signed-off-by: emesika --- M lib/vdsm/dsaversion.py.in 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/08/59308/1 diff --git a/lib/vdsm/dsaversion.py.in b/lib/vdsm/dsaversion.py.in index 6bbc02a..f9c5649 100644 --- a/lib/vdsm/dsaversion.py.in +++ b/lib/vdsm/dsaversion.py.in @@ -35,9 +35,9 @@ 'version_name': version_name, 'software_version': software_version, 'software_revision': software_revision, -'supportedENGINEs': ['3.5', '3.6', '4.0'], -'clusterLevels': ['3.5', '3.6', '4.0'], +'supportedENGINEs': ['3.5', '3.6', '4.0', '4.1'], +'clusterLevels': ['3.5', '3.6', '4.0', '4.1'], } if cpuarch.real() == cpuarch.PPC64LE: -version_info['clusterLevels'] = ['3.6', '4.0'] +version_info['clusterLevels'] = ['3.6', '4.0', '4.1'] -- To view, visit https://gerrit.ovirt.org/59308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7aaaf4d6ebf6c1e0fdcb37a158993a7b84c7f06d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: vdsm: adding support for version 4.1
Eli Mesika has posted comments on this change. Change subject: vdsm: adding support for version 4.1 .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/59308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7aaaf4d6ebf6c1e0fdcb37a158993a7b84c7f06d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: vdsm: adding support for version 4.1
Eli Mesika has posted comments on this change. Change subject: vdsm: adding support for version 4.1 .. Patch Set 1: (1 comment) https://gerrit.ovirt.org/#/c/59308/1/lib/vdsm/dsaversion.py.in File lib/vdsm/dsaversion.py.in: Line 35: 'version_name': version_name, Line 36: 'software_version': software_version, Line 37: 'software_revision': software_revision, Line 38: 'supportedENGINEs': ['3.5', '3.6', '4.0', '4.1'], Line 39: 'clusterLevels': ['3.5', '3.6', '4.0', '4.1'], > We don't support 3.5 now, and should not support 3.6 on master - for both o Done Line 40: } Line 41: Line 42: if cpuarch.real() == cpuarch.PPC64LE: -- To view, visit https://gerrit.ovirt.org/59308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7aaaf4d6ebf6c1e0fdcb37a158993a7b84c7f06d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: vdsm: adding support for version 4.1
Eli Mesika has posted comments on this change. Change subject: vdsm: adding support for version 4.1 .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.ovirt.org/59308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7aaaf4d6ebf6c1e0fdcb37a158993a7b84c7f06d Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: vdsm: adding support for version 4.1
Eli Mesika has posted comments on this change. Change subject: vdsm: adding support for version 4.1 .. Patch Set 2: (1 comment) https://gerrit.ovirt.org/#/c/59308/2/lib/vdsm/dsaversion.py.in File lib/vdsm/dsaversion.py.in: Line 39: 'clusterLevels': ['4.0', '4.1'], Line 40: } Line 41: Line 42: if cpuarch.real() == cpuarch.PPC64LE: Line 43: version_info['clusterLevels'] = ['4.0', '4.1'] > we don't really plan to stop the support in foreseeable future, so this can Not relevant to this patch IMO , might be done in a separate patch -- To view, visit https://gerrit.ovirt.org/59308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7aaaf4d6ebf6c1e0fdcb37a158993a7b84c7f06d Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: Michal Skrivanek Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Oved Ourfali Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: vdsm: adding handling for NGN in osinfo.py
Eli Mesika has uploaded a new change for review. Change subject: vdsm: adding handling for NGN in osinfo.py .. vdsm: adding handling for NGN in osinfo.py Current osinfo.py implementation lacks handling for NGN (New Generation Node). This patch adds another parameter in addition to the osname, release and version named pretty_name, that is empty bu default and if /etc/os-release file exists on the OS, will return the content of the PRETTY_NAME value (if exists) from that file. Change-Id: Ida119527b263302bf3f78e359bac12113718b744 Bug-Url : https://bugzilla.redhat.com/show_bug.cgi?id=1324447 Signed-off-by: emesika --- M lib/api/vdsm-api.yml M lib/vdsm/osinfo.py 2 files changed, 32 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/31/59431/1 diff --git a/lib/api/vdsm-api.yml b/lib/api/vdsm-api.yml index 475ccda..2814fc5 100644 --- a/lib/api/vdsm-api.yml +++ b/lib/api/vdsm-api.yml @@ -4650,6 +4650,10 @@ - description: The OS version (eg. 17 for Fedora 17) name: version type: string + +- description: The OS pretty name +name: pretty_name +type: string type: object WatchdogEventAction: &WatchdogEventAction diff --git a/lib/vdsm/osinfo.py b/lib/vdsm/osinfo.py index 8ad99a1..0910872 100644 --- a/lib/vdsm/osinfo.py +++ b/lib/vdsm/osinfo.py @@ -23,6 +23,7 @@ import glob import linecache import logging +import shlex import time import os @@ -106,18 +107,34 @@ return OSName.UNKNOWN -def _parse_node_version(path): +def _parse_release_file(path): data = {} -with open(path) as f: -for line in f: -try: -key, value = [kv.strip() for kv in line.split('=', 1)] -except ValueError: -continue +try: +with open(path) as f: +for line in shlex.split(f, comments=True): +try: +key, value = line.split('=', 1) +except ValueError: +continue -data[key] = value +data[key] = value +except IOError: +logging.exception('Fail to read release file') +return data + +def _parse_node_version(path): +data = _parse_release_file(path) return data.get('VERSION', ''), data.get('RELEASE', '') + + +def _get_pretty_name(): +pretty_name = '' +if os.path.exists('/etc/os-release'): +data = _parse_release_file('/etc/os-release') +if data.get('PRETTY_NAME') is not None: +pretty_name = data.get('PRETTY_NAME').strip('"') +return pretty_name @utils.memoized @@ -131,6 +148,7 @@ version = release_name = '' osname = _release_name() +pretty_name = _get_pretty_name() try: if osname == OSName.RHEVH or osname == OSName.OVIRT: version, release_name = _parse_node_version('/etc/default/version') @@ -150,7 +168,8 @@ except: logging.error('failed to find version/release', exc_info=True) -return dict(release=release_name, version=version, name=osname) +return dict(release=release_name, version=version, +name=osname, pretty_name=pretty_name) def selinux_status(): -- To view, visit https://gerrit.ovirt.org/59431 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ida119527b263302bf3f78e359bac12113718b744 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: vdsm: adding handling for NGN in osinfo.py
Eli Mesika has abandoned this change. Change subject: vdsm: adding handling for NGN in osinfo.py .. Abandoned Abandoned due to Dans comment , solution will have a different approach for NGN using the original osname, release and version and adding the PRETTY_NAME that will have the details about the NGN from the /etc/os-release file -- To view, visit https://gerrit.ovirt.org/57620 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I17337643cd4e986c09b07137d80da3555161ee70 Gerrit-PatchSet: 20 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Fabian Deutsch Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Oved Ourfali Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: vdsm: adding support for version 4.1
Eli Mesika has posted comments on this change. Change subject: vdsm: adding support for version 4.1 .. Patch Set 2: (1 comment) https://gerrit.ovirt.org/#/c/59308/2/lib/vdsm/dsaversion.py.in File lib/vdsm/dsaversion.py.in: Line 39: 'clusterLevels': ['4.0', '4.1'], Line 40: } Line 41: Line 42: if cpuarch.real() == cpuarch.PPC64LE: Line 43: version_info['clusterLevels'] = ['4.0', '4.1'] > This should be removed once ppc64le version is same as others. Done -- To view, visit https://gerrit.ovirt.org/59308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7aaaf4d6ebf6c1e0fdcb37a158993a7b84c7f06d Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: Michal Skrivanek Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Oved Ourfali Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: vdsm: adding support for version 4.1
Eli Mesika has posted comments on this change. Change subject: vdsm: adding support for version 4.1 .. Patch Set 3: Verified+1 -- To view, visit https://gerrit.ovirt.org/59308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7aaaf4d6ebf6c1e0fdcb37a158993a7b84c7f06d Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: Michal Skrivanek Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Oved Ourfali Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: vdsm: adding support for version 4.1
Eli Mesika has posted comments on this change. Change subject: vdsm: adding support for version 4.1 .. Patch Set 3: (1 comment) https://gerrit.ovirt.org/#/c/59308/3/lib/vdsm/dsaversion.py.in File lib/vdsm/dsaversion.py.in: Line 35: 'version_name': version_name, Line 36: 'software_version': software_version, Line 37: 'software_revision': software_revision, Line 38: 'supportedENGINEs': ['3.5', '3.6', '4.0', '4.1'], Line 39: 'clusterLevels': ['3.5','3.6', '4.0', '4.1'], > You are missing space before '3.6' and have a redundant space after it. Done Line 40: } Line 41: Line 42: if cpuarch.real() == cpuarch.PPC64LE: -- To view, visit https://gerrit.ovirt.org/59308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7aaaf4d6ebf6c1e0fdcb37a158993a7b84c7f06d Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: Michal Skrivanek Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Oved Ourfali Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: vdsm: adding handling for NGN in osinfo.py
Eli Mesika has posted comments on this change. Change subject: vdsm: adding handling for NGN in osinfo.py .. Patch Set 3: Verified+1 -- To view, visit https://gerrit.ovirt.org/59431 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ida119527b263302bf3f78e359bac12113718b744 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Fabian Deutsch Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: vdsm: adding handling for NGN in osinfo.py
Hello Piotr Kliczewski, I'd like you to do a code review. Please visit https://gerrit.ovirt.org/60433 to review the following change. Change subject: vdsm: adding handling for NGN in osinfo.py .. vdsm: adding handling for NGN in osinfo.py Current osinfo.py implementation lacks handling for NGN (New Generation Node). This patch adds another parameter in addition to the osname, release and version named pretty_name, that is empty by default and if /etc/os-release file exists on the OS, will return the content of the PRETTY_NAME value (if exists) from that file. Change-Id: Ida119527b263302bf3f78e359bac12113718b744 Bug-Url : https://bugzilla.redhat.com/show_bug.cgi?id=1324447 Signed-off-by: emesika Reviewed-on: https://gerrit.ovirt.org/59431 Continuous-Integration: Jenkins CI Reviewed-by: Piotr Kliczewski --- M lib/api/vdsm-api.yml M lib/vdsm/osinfo.py 2 files changed, 31 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/33/60433/1 diff --git a/lib/api/vdsm-api.yml b/lib/api/vdsm-api.yml index ab6ca0d..c9a74a6 100644 --- a/lib/api/vdsm-api.yml +++ b/lib/api/vdsm-api.yml @@ -4649,6 +4649,10 @@ - description: The OS version (eg. 17 for Fedora 17) name: version type: string + +- description: The OS pretty name +name: pretty_name +type: string type: object WatchdogEventAction: &WatchdogEventAction diff --git a/lib/vdsm/osinfo.py b/lib/vdsm/osinfo.py index 8ad99a1..3c6ab3b 100644 --- a/lib/vdsm/osinfo.py +++ b/lib/vdsm/osinfo.py @@ -106,18 +106,34 @@ return OSName.UNKNOWN -def _parse_node_version(path): +def _parse_release_file(path): data = {} -with open(path) as f: -for line in f: -try: -key, value = [kv.strip() for kv in line.split('=', 1)] -except ValueError: -continue +try: +with open(path) as f: +for line in f: +try: +key, value = [kv.strip() for kv in line.split('=', 1)] +except ValueError: +continue -data[key] = value +data[key] = value +except IOError: +logging.exception('Fail to read release file') +return data + +def _parse_node_version(path): +data = _parse_release_file(path) return data.get('VERSION', ''), data.get('RELEASE', '') + + +def _get_pretty_name(): +pretty_name = '' +if os.path.exists('/etc/os-release'): +data = _parse_release_file('/etc/os-release') +if data.get('PRETTY_NAME') is not None: +pretty_name = data.get('PRETTY_NAME').strip('"') +return pretty_name @utils.memoized @@ -131,6 +147,7 @@ version = release_name = '' osname = _release_name() +pretty_name = _get_pretty_name() try: if osname == OSName.RHEVH or osname == OSName.OVIRT: version, release_name = _parse_node_version('/etc/default/version') @@ -150,7 +167,8 @@ except: logging.error('failed to find version/release', exc_info=True) -return dict(release=release_name, version=version, name=osname) +return dict(release=release_name, version=version, +name=osname, pretty_name=pretty_name) def selinux_status(): -- To view, visit https://gerrit.ovirt.org/60433 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ida119527b263302bf3f78e359bac12113718b744 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Piotr Kliczewski ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: vdsm: adding handling for NGN in osinfo.py
Eli Mesika has posted comments on this change. Change subject: vdsm: adding handling for NGN in osinfo.py .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/60433 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ida119527b263302bf3f78e359bac12113718b744 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: gluster:enforce gluster fencing policies
Eli Mesika has posted comments on this change. Change subject: gluster:enforce gluster fencing policies .. Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/59600 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2c18571209a3a7682a43bd2814b9ee3f0a69c55f Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ramesh N Gerrit-Reviewer: Darshan N Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Oved Ourfali Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Ramesh N Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: vdsm: making PM 'on' and 'off' sync
Eli Mesika has uploaded a new change for review. Change subject: vdsm: making PM 'on' and 'off' sync .. vdsm: making PM 'on' and 'off' sync Consider the following scenario: DC1 with H1 (with PM) and H2 on cluster C1 another host H3 on DC1 cluster C2 When we are blocking the communication with iptables from H2 to H1 PM card and use the default proxy preferences (cluster, dc) a Restart operation will always fail. VDSM should perform start/stop sync and return the correct script returned code in order that engine will know that H2 fails to perform the operation and will try to use H3 as a proxy for the failed operation This patch changes the fenceNode function to be sync when 'on' 'off' operation are used in the same manner of 'status' operation and return the correct exit code of the invoked fencing script to the caller. Change-Id: I81d45977664c99c954c4663a26642e6e21cc65e3 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1139643 Signed-off-by: Eli Mesika --- M vdsm/API.py 1 file changed, 16 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/95/32695/1 diff --git a/vdsm/API.py b/vdsm/API.py index eeb813c..48048fd 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -1223,19 +1223,19 @@ inp += 'secure=yes\n' inp += options +try: +rc, out, err = fence(script, inp) +except OSError as e: +if e.errno == os.errno.ENOENT: +return errCode['fenceAgent'] +raise +self.log.debug('rc %s in %s out %s err %s', rc, + hidePasswd(inp), out, err) +if not 0 <= rc <= 2: +return {'status': {'code': 1, + 'message': out + err}} +message = doneCode['message'] if action == 'status': -try: -rc, out, err = fence(script, inp) -except OSError as e: -if e.errno == os.errno.ENOENT: -return errCode['fenceAgent'] -raise -self.log.debug('rc %s in %s out %s err %s', rc, - hidePasswd(inp), out, err) -if not 0 <= rc <= 2: -return {'status': {'code': 1, - 'message': out + err}} -message = doneCode['message'] if rc == 0: power = 'on' elif rc == 2: @@ -1245,9 +1245,10 @@ message = out + err return {'status': {'code': 0, 'message': message}, 'power': power} -threading.Thread(target=fence, args=(script, inp)).start() - -return {'status': doneCode, 'operationStatus': 'initiated'} +if rc != 0: +message = out + err +return {'status': {'code': rc, 'message': message}, +'power': 'unknown'} def ping(self): "Ping the server. Useful for tests" -- To view, visit http://gerrit.ovirt.org/32695 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I81d45977664c99c954c4663a26642e6e21cc65e3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: making PM 'on' and 'off' sync
Eli Mesika has posted comments on this change. Change subject: vdsm: making PM 'on' and 'off' sync .. Patch Set 1: Verified+1 -- To view, visit http://gerrit.ovirt.org/32695 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I81d45977664c99c954c4663a26642e6e21cc65e3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: making PM 'on' and 'off' sync
Eli Mesika has posted comments on this change. Change subject: vdsm: making PM 'on' and 'off' sync .. Patch Set 2: Verified+1 -- To view, visit http://gerrit.ovirt.org/32695 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I81d45977664c99c954c4663a26642e6e21cc65e3 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Oved Ourfali Gerrit-Reviewer: Saggi Mizrahi Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: making PM 'on' and 'off' sync
Eli Mesika has posted comments on this change. Change subject: vdsm: making PM 'on' and 'off' sync .. Patch Set 2: (1 comment) http://gerrit.ovirt.org/#/c/32695/2/vdsm/API.py File vdsm/API.py: Line 1247: 'power': power} Line 1248: if rc != 0: Line 1249: message = out + err Line 1250: return {'status': {'code': rc, 'message': message}, Line 1251: 'power': 'unknown'} > and if you'll verify that and we'll decide to change this part, please cons Done Line 1252: Line 1253: def ping(self): Line 1254: "Ping the server. Useful for tests" Line 1255: updateTimestamp() -- To view, visit http://gerrit.ovirt.org/32695 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I81d45977664c99c954c4663a26642e6e21cc65e3 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Barak Azulay Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Oved Ourfali Gerrit-Reviewer: Saggi Mizrahi Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: making PM 'on' and 'off' sync
Eli Mesika has posted comments on this change. Change subject: vdsm: making PM 'on' and 'off' sync .. Patch Set 3: Verified+1 -- To view, visit http://gerrit.ovirt.org/32695 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I81d45977664c99c954c4663a26642e6e21cc65e3 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Barak Azulay Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Oved Ourfali Gerrit-Reviewer: Saggi Mizrahi Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: making PM 'on' and 'off' sync
Eli Mesika has posted comments on this change. Change subject: vdsm: making PM 'on' and 'off' sync .. Patch Set 3: -Verified (1 comment) http://gerrit.ovirt.org/#/c/32695/3/vdsm/API.py File vdsm/API.py: Line 1253: message = out + err Line 1254: ret = {'status': {'code': rc, 'message': message}, Line 1255:'power': 'unknown'} Line 1256: Line 1257: return ret > Eli, 'operationStatus': 'initiated' has to be contained in return value, ot So else: ... ret = {'status': {'code': rc, 'message': message}, 'power': 'unknown', 'operationStatus': 'initiated'} Is that OK ? Line 1258: Line 1259: def ping(self): Line 1260: "Ping the server. Useful for tests" Line 1261: updateTimestamp() -- To view, visit http://gerrit.ovirt.org/32695 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I81d45977664c99c954c4663a26642e6e21cc65e3 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Barak Azulay Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Oved Ourfali Gerrit-Reviewer: Saggi Mizrahi Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: making PM 'on' and 'off' sync
Eli Mesika has posted comments on this change. Change subject: vdsm: making PM 'on' and 'off' sync .. Patch Set 3: (1 comment) http://gerrit.ovirt.org/#/c/32695/3/vdsm/API.py File vdsm/API.py: Line 1253: message = out + err Line 1254: ret = {'status': {'code': rc, 'message': message}, Line 1255:'power': 'unknown'} Line 1256: Line 1257: return ret > Yes, thanks. Done Line 1258: Line 1259: def ping(self): Line 1260: "Ping the server. Useful for tests" Line 1261: updateTimestamp() -- To view, visit http://gerrit.ovirt.org/32695 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I81d45977664c99c954c4663a26642e6e21cc65e3 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Barak Azulay Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Oved Ourfali Gerrit-Reviewer: Saggi Mizrahi Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: making PM 'on' and 'off' sync
Eli Mesika has posted comments on this change. Change subject: vdsm: making PM 'on' and 'off' sync .. Patch Set 4: (4 comments) http://gerrit.ovirt.org/#/c/32695/4/vdsm/API.py File vdsm/API.py: Line 1227: try: Line 1228: rc, out, err = fence(script, inp) Line 1229: except OSError as e: Line 1230: if e.errno == os.errno.ENOENT: Line 1231: ret = errCode['fenceAgent'] > we create a regression here. we returned before, now we'll move on after th Done Line 1232: else: Line 1233: raise Line 1234: self.log.debug('rc %s in %s out %s err %s', rc, Line 1235:hidePasswd(inp), out, err) Line 1231: ret = errCode['fenceAgent'] Line 1232: else: Line 1233: raise Line 1234: self.log.debug('rc %s in %s out %s err %s', rc, Line 1235:hidePasswd(inp), out, err) > the debug log should be with 2 indentations back why??? , it is fully aligned with 4 spaces exactly as it preceding line and it passes pep8 Line 1236: if not 0 <= rc <= 2: Line 1237: ret = {'status': {'code': 1, Line 1238: 'message': out + err}} Line 1239: else: Line 1232: else: Line 1233: raise Line 1234: self.log.debug('rc %s in %s out %s err %s', rc, Line 1235:hidePasswd(inp), out, err) Line 1236: if not 0 <= rc <= 2: > i prefer - The condition as is is more readable as status return code should be between 0 and 2 Line 1237: ret = {'status': {'code': 1, Line 1238: 'message': out + err}} Line 1239: else: Line 1240: message = doneCode['message'] Line 1236: if not 0 <= rc <= 2: Line 1237: ret = {'status': {'code': 1, Line 1238: 'message': out + err}} Line 1239: else: Line 1240: message = doneCode['message'] > this can be the initial ret value instead of None and you can remove this e didn't got you here , ret is initialized to None , this line sets the message . Line 1241: if action == 'status': Line 1242: if rc == 0: Line 1243: power = 'on' Line 1244: elif rc == 2: -- To view, visit http://gerrit.ovirt.org/32695 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I81d45977664c99c954c4663a26642e6e21cc65e3 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Barak Azulay Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Oved Ourfali Gerrit-Reviewer: Saggi Mizrahi Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: making PM 'on' and 'off' sync
Eli Mesika has posted comments on this change. Change subject: vdsm: making PM 'on' and 'off' sync .. Patch Set 5: Verified+1 verified and working as expected on engine 3.3 -- To view, visit http://gerrit.ovirt.org/32695 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I81d45977664c99c954c4663a26642e6e21cc65e3 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Barak Azulay Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Oved Ourfali Gerrit-Reviewer: Saggi Mizrahi Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: making PM 'on' and 'off' sync
Eli Mesika has posted comments on this change. Change subject: vdsm: making PM 'on' and 'off' sync .. Patch Set 5: (1 comment) http://gerrit.ovirt.org/#/c/32695/5/vdsm/API.py File vdsm/API.py: Line 1234:hideP > this debug print needs to get under the else Done -- To view, visit http://gerrit.ovirt.org/32695 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I81d45977664c99c954c4663a26642e6e21cc65e3 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Barak Azulay Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Oved Ourfali Gerrit-Reviewer: Saggi Mizrahi Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: making PM 'on' and 'off' sync
Eli Mesika has posted comments on this change. Change subject: vdsm: making PM 'on' and 'off' sync .. Patch Set 6: Verified+1 -- To view, visit http://gerrit.ovirt.org/32695 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I81d45977664c99c954c4663a26642e6e21cc65e3 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Barak Azulay Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Oved Ourfali Gerrit-Reviewer: Saggi Mizrahi Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: making PM 'on' and 'off' sync
Eli Mesika has posted comments on this change. Change subject: vdsm: making PM 'on' and 'off' sync .. Patch Set 7: Verified+1 Verified after manually applied JSON patch http://gerrit.ovirt.org/#/c/33424/ -- To view, visit http://gerrit.ovirt.org/32695 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I81d45977664c99c954c4663a26642e6e21cc65e3 Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Barak Azulay Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Martin Peřina Gerrit-Reviewer: Oved Ourfali Gerrit-Reviewer: Saggi Mizrahi Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: vdsm: making PM 'on' and 'off' sync
Eli Mesika has uploaded a new change for review. Change subject: vdsm: making PM 'on' and 'off' sync .. vdsm: making PM 'on' and 'off' sync Consider the following scenario: DC1 with H1 (with PM) and H2 on cluster C1 another host H3 on DC1 cluster C2 When we are blocking the communication with iptables from H2 to H1 PM card and use the default proxy preferences (cluster, dc) a Restart operation will always fail. VDSM should perform start/stop sync and return the correct script returned code in order that engine will know that H2 fails to perform the operation and will try to use H3 as a proxy for the failed operation This patch changes the fenceNode function to be sync when 'on' 'off' operation are used in the same manner of 'status' operation and return the correct exit code of the invoked fencing script to the caller. Change-Id: I81d45977664c99c954c4663a26642e6e21cc65e3 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1139643 Signed-off-by: Eli Mesika --- M vdsm/API.py 1 file changed, 16 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/69/33469/1 diff --git a/vdsm/API.py b/vdsm/API.py index 6378f2c..5d948f8 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -1205,19 +1205,19 @@ inp += 'secure=yes\n' inp += options +try: +rc, out, err = fence(script, inp) +except OSError as e: +if e.errno == os.errno.ENOENT: +return errCode['fenceAgent'] +raise +self.log.debug('rc %s in %s out %s err %s', rc, + hidePasswd(inp), out, err) +if not 0 <= rc <= 2: +return {'status': {'code': 1, + 'message': out + err}} +message = doneCode['message'] if action == 'status': -try: -rc, out, err = fence(script, inp) -except OSError as e: -if e.errno == os.errno.ENOENT: -return errCode['fenceAgent'] -raise -self.log.debug('rc %s in %s out %s err %s', rc, - hidePasswd(inp), out, err) -if not 0 <= rc <= 2: -return {'status': {'code': 1, - 'message': out + err}} -message = doneCode['message'] if rc == 0: power = 'on' elif rc == 2: @@ -1227,9 +1227,10 @@ message = out + err return {'status': {'code': 0, 'message': message}, 'power': power} -threading.Thread(target=fence, args=(script, inp)).start() -return {'status': doneCode, 'power': 'unknown', -'operationStatus': 'initiated'} +if rc != 0: +message = out + err +return {'status': {'code': rc, 'message': message}, +'power': 'unknown', 'operationStatus': 'initiated'} def ping(self): "Ping the server. Useful for tests" -- To view, visit http://gerrit.ovirt.org/33469 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I81d45977664c99c954c4663a26642e6e21cc65e3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Eli Mesika ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: vdsm: making PM 'on' and 'off' sync
Eli Mesika has posted comments on this change. Change subject: vdsm: making PM 'on' and 'off' sync .. Patch Set 1: Verified+1 -- To view, visit http://gerrit.ovirt.org/33469 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I81d45977664c99c954c4663a26642e6e21cc65e3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: vdsm: No need to 'import threading'
Eli Mesika has posted comments on this change. Change subject: vdsm: No need to 'import threading' .. Patch Set 2: Code-Review+1 -- To view, visit http://gerrit.ovirt.org/33522 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id03208158486a8b0741dbe40d517f437a687fdbd Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Ondřej Svoboda Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Remove verbosity from restorecon hack for /var/log/core.
Eli Mesika has posted comments on this change. Change subject: Remove verbosity from restorecon hack for /var/log/core. .. Patch Set 1: Code-Review+1 -- To view, visit http://gerrit.ovirt.org/21888 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I862039a6dfeebe38fc5c62276ae98213ef92bd02 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: mooli tayer Gerrit-Reviewer: Barak Azulay Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: mooli tayer Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: Add ioTune support at vm creation
Eli Mesika has posted comments on this change. Change subject: vdsm: Add ioTune support at vm creation .. Patch Set 12: Looks good to me, but someone else must approve -- To view, visit http://gerrit.ovirt.org/14636 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie4034648620ed9212c06c12607bb889d97cca9d6 Gerrit-PatchSet: 12 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mei Liu Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Doron Fediuck Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Giuseppe Vallarelli Gerrit-Reviewer: Mark Wu Gerrit-Reviewer: Martin Sivák Gerrit-Reviewer: Mei Liu Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: set ballooon device model properly
Eli Mesika has uploaded a new change for review. Change subject: vdsm: set ballooon device model properly .. vdsm: set ballooon device model properly The model of the balloon device is in the sepcParams map of the device. Changing code to search this attribute inside the spec params map rather than a free attribute of the device. Change-Id: I706ad219c604871fa47924941448d429fe2a188d Signed-off-by: Eli Mesika --- M vdsm/libvirtvm.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/00/4900/1 -- To view, visit http://gerrit.ovirt.org/4900 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I706ad219c604871fa47924941448d429fe2a188d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: set ballooon device model properly
Eli Mesika has abandoned this change. Change subject: vdsm: set ballooon device model properly .. Patch Set 2: Abandoned -- To view, visit http://gerrit.ovirt.org/4900 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I706ad219c604871fa47924941448d429fe2a188d Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Gal Hammer Gerrit-Reviewer: Igor Lvovsky ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: set ballooon device model properly
Eli Mesika has abandoned this change. Change subject: vdsm: set ballooon device model properly .. Patch Set 2: Restored -- To view, visit http://gerrit.ovirt.org/4900 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I706ad219c604871fa47924941448d429fe2a188d Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Gal Hammer Gerrit-Reviewer: Igor Lvovsky ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: set ballooon device model properly
Eli Mesika has posted comments on this change. Change subject: vdsm: set ballooon device model properly .. Patch Set 3: Verified -- To view, visit http://gerrit.ovirt.org/4900 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I706ad219c604871fa47924941448d429fe2a188d Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Gal Hammer Gerrit-Reviewer: Igor Lvovsky ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm:vdsm is not looking for new libvirt-daemon...
Eli Mesika has uploaded a new change for review. Change subject: vdsm:vdsm is not looking for new libvirt-daemon... .. vdsm:vdsm is not looking for new libvirt-daemon... https://bugzilla.redhat.com/838591 vdsm is not looking for new libvirt-daemon package on vdsmd startup. libvirt has changed package name from libvirt to libvirt-daemon. As a result, vdsm fails in start_libvirtd while trying to find libvirt instead of libvirt-daemon Adding libvirt-daemon to the package list defined in vdsmd.init.in:start_libvirtd Change-Id: Id33c121b8e27db0ba6f5d3db2d0905507c4bbe1b Signed-off-by: Eli Mesika --- M vdsm/vdsmd.init.in 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/76/6076/1 -- To view, visit http://gerrit.ovirt.org/6076 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id33c121b8e27db0ba6f5d3db2d0905507c4bbe1b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm:vms with shared disk will pause...(#834893)
Eli Mesika has uploaded a new change for review. Change subject: vdsm:vms with shared disk will pause...(#834893) .. vdsm:vms with shared disk will pause...(#834893) vms with shared disk will pause due to I/O errors on double use of PCI Address https://bugzilla.redhat.com/show_bug.cgi?id=834893 Problem is not related to duplicate PCI addresses. The problem was that vdsm does not add the libvirt 'sharable' flag when getting a Disk with the shared flag set from core. Solution is to set the shareable flag in libvirtvm.py and for backward compatibility set it to false in vm.py Change-Id: I82714a3a4fd86184b8ed48ef33ce69d0640d96ed Signed-off-by: Eli Mesika --- M vdsm/libvirtvm.py M vdsm/vm.py 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/83/6283/1 -- To view, visit http://gerrit.ovirt.org/6283 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I82714a3a4fd86184b8ed48ef33ce69d0640d96ed Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm:vms with shared disk will pause...(#834893)
Eli Mesika has posted comments on this change. Change subject: vdsm:vms with shared disk will pause...(#834893) .. Patch Set 1: (2 inline comments) Commit Message Line 7: vdsm:vms with shared disk will pause...(#834893) Done Line 9: vms with shared disk will pause due to I/O errors on double use of PCI Done -- To view, visit http://gerrit.ovirt.org/6283 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I82714a3a4fd86184b8ed48ef33ce69d0640d96ed Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Ayal Baron Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eduardo Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Igor Lvovsky ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: BZ#834893: vms with shared disk will pause...
Eli Mesika has posted comments on this change. Change subject: BZ#834893: vms with shared disk will pause... .. Patch Set 2: (2 inline comments) Commit Message Line 10: getting a Disk with the shared flag set from core. Hi Mark What we actually saw in the paused machine log (under libvirt/qemu) is that there was an I/O error when the shareable flag was not passed. Another thing is that possibly this I/O error was connected to SE Linux since when downgrading SE Linux from enforcing to permissive we didn't got the I/O error even without the patch fix. File vdsm/libvirtvm.py Line 1058: if utils.tobool(self.shared): Done -- To view, visit http://gerrit.ovirt.org/6283 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I82714a3a4fd86184b8ed48ef33ce69d0640d96ed Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Ayal Baron Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eduardo Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Igor Lvovsky Gerrit-Reviewer: Mark Wu ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: BZ#834893: vms with shared disk will pause...
Eli Mesika has posted comments on this change. Change subject: BZ#834893: vms with shared disk will pause... .. Patch Set 3: (3 inline comments) Commit Message Line 7: BZ#834893: vms with shared disk will pause... Done File vdsm/libvirtvm.py Line 1058: if hasattr(self, 'shared') and utils.tobool(self.shared): Done Line 1058: if hasattr(self, 'shared') and utils.tobool(self.shared): out of this patch scope -- To view, visit http://gerrit.ovirt.org/6283 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I82714a3a4fd86184b8ed48ef33ce69d0640d96ed Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Ayal Baron Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eduardo Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Igor Lvovsky Gerrit-Reviewer: Mark Wu ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: BZ#840386: vms with shared disk will pause...
Eli Mesika has posted comments on this change. Change subject: BZ#840386: vms with shared disk will pause... .. Patch Set 4: (1 inline comment) File vdsm/vm.py Line 519: drv['shared'] = False Yes, if it is set by core , see the code that handles that on the other file. Renaming from share to shareable is out of the scope of this patch and may be done if decided on a separate patch -- To view, visit http://gerrit.ovirt.org/6283 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I82714a3a4fd86184b8ed48ef33ce69d0640d96ed Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Ayal Baron Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eduardo Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Igor Lvovsky Gerrit-Reviewer: Mark Wu ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: BZ#840386: vms with shared disk will pause...
Eli Mesika has posted comments on this change. Change subject: BZ#840386: vms with shared disk will pause... .. Patch Set 4: (1 inline comment) File vdsm/vm.py Line 519: drv['shared'] = False Keep in mind that getConfDrives is called only when we can not find 'devices' and we find 'drives' which is the pre 3.1 syntax, so , the for block is executed only for 3.0 and below since in case of 3.1 confDrives = self.conf['drives'] if self.conf.get('drives') else [] will return an empty array and the loop is skipped -- To view, visit http://gerrit.ovirt.org/6283 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I82714a3a4fd86184b8ed48ef33ce69d0640d96ed Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Ayal Baron Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eduardo Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Igor Lvovsky Gerrit-Reviewer: Mark Wu ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: BZ#840386: vms with shared disk will pause...
Eli Mesika has posted comments on this change. Change subject: BZ#840386: vms with shared disk will pause... .. Patch Set 4: Verified -- To view, visit http://gerrit.ovirt.org/6283 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I82714a3a4fd86184b8ed48ef33ce69d0640d96ed Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eli Mesika Gerrit-Reviewer: Ayal Baron Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eduardo Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Igor Lvovsky Gerrit-Reviewer: Mark Wu ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: fenceNode API is missing the options argument
Eli Mesika has posted comments on this change. Change subject: fenceNode API is missing the options argument .. Patch Set 1: Looks good to me, but someone else must approve -- To view, visit http://gerrit.ovirt.org/7058 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib2ce9b0f71040f9198413fa06c5d8768994842ec Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Roy Golan Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: infra: adding debug log to vdsm daemon init script
Eli Mesika has posted comments on this change. Change subject: infra: adding debug log to vdsm daemon init script .. Patch Set 2: (4 inline comments) File vdsm/vdsmd.init.in Line 47: SYSTEMCTL_SKIP_REDIRECT=true Line 48: Line 49: . /etc/init.d/functions Line 50: Line 51: debug_log() { [[ -n "$DEBUG" ]] && (echo "$*" >> $DEBUG_LOG) } why $* if you are using only $1 in all calls ? Line 52: log_failure_msg() { echo -n "$@"; failure "$@"; echo; } Line 53: log_success_msg() { echo -n "$@"; success "$@"; echo; } Line 54: Line 55: check_port_taken() { Line 160: Line 161: for srv in $NEEDED_SERVICES Line 162: do Line 163: if ! /sbin/service $srv status > /dev/null 2>&1; # Verify that status is inactive Line 164: then please remove TLS Line 165: echo "Starting $srv..." Line 166: /sbin/service $srv start Line 167: ret_val=$? Line 168: if [ $ret_val -ne 0 ] Line 179: test_lo() { Line 180: if ! LC_ALL=C /sbin/ifconfig lo | /bin/grep -q UP; Line 181: then Line 182: log_failure_msg "VDSMD: lo interface is down, can't run !" Line 183: echo "VDSMD: lo interface is down, can't run !" > /dev/kmsg same Line 184: return 1 Line 185: fi Line 186: return 0 Line 187: } Line 471: ret_val=$? Line 472: if [ $ret_val -ne 0 ] Line 473: then Line 474:log_failure_msg "$prog: one of the dependent services did not start, error code $ret_val" Line 475:debug_log "error starting ext srvs" why use short-cuts for a log message ? it should be detailed Line 476:return $ret_val Line 477: fi Line 478: Line 479: @VDSMDIR@/vdsm-restore-net-config -- To view, visit http://gerrit.ovirt.org/7340 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I39ef7e19ede6eaed5c3f27b8c46f6f2b14dd08bd Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Igor Lvovsky Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: infra: adding debug log to vdsm daemon init script
Eli Mesika has posted comments on this change. Change subject: infra: adding debug log to vdsm daemon init script .. Patch Set 7: Looks good to me, but someone else must approve -- To view, visit http://gerrit.ovirt.org/7340 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I39ef7e19ede6eaed5c3f27b8c46f6f2b14dd08bd Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Douglas Schilling Landgraf Gerrit-Reviewer: Eli Mesika Gerrit-Reviewer: Igor Lvovsky Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches