Change in vdsm[master]: caps: Collect numa information
Francesco Romani has posted comments on this change. Change subject: caps: Collect numa information .. Patch Set 12: Code-Review+1 (1 comment) http://gerrit.ovirt.org/#/c/23703/12/vdsm_api/vdsmapi-schema.json File vdsm_api/vdsmapi-schema.json: Line 975: # @UNKNOWN:Can't get the status(maybe not support in this kernel version) Line 976: # Line 977: # Since: 4.15.0 Line 978: ## Line 979: {'enum': 'AutoNumaBalancingStatus', 'data': ['DISABLE', 'ENABLE', 'UNKNOWN']} My personal taste is to use lowercase or Capitalized, but I see there are some enums ALL UPPERCASE (HaMaintenanceMode being the first example), so I think it is good enough. Line 980: Line 981: ## Line 982: # @HookScriptInfoMap: Line 983: # -- To view, visit http://gerrit.ovirt.org/23703 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I63eeb697ab986c3b9cad0dc44f41924f329e52cd Gerrit-PatchSet: 12 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Xiaolei Shi xiao-lei@hp.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Doron Fediuck dfedi...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Gilad Chaplik gchap...@redhat.com Gerrit-Reviewer: Gustavo Frederico Temple Pedrosa gustavo.pedr...@eldorado.org.br Gerrit-Reviewer: Leonardo Bianconi leonardo.bianc...@eldorado.org.br Gerrit-Reviewer: Martin Sivák msi...@redhat.com Gerrit-Reviewer: Michal Skrivanek michal.skriva...@redhat.com Gerrit-Reviewer: Vitor de Lima vitor.l...@eldorado.org.br Gerrit-Reviewer: Xiaolei Shi xiao-lei@hp.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com 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[ovirt-3.4]: packaging: add qemu user to cdrom group
Sandro Bonazzola has posted comments on this change. Change subject: packaging: add qemu user to cdrom group .. Patch Set 1: Missing merge :-) -- To view, visit http://gerrit.ovirt.org/26705 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I44d842e7b1df073c33284b51185e29ce0d02a0e0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.4 Gerrit-Owner: Sandro Bonazzola sbona...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Sandro Bonazzola sbona...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Zhou Zheng Sheng zhshz...@linux.vnet.ibm.com 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]: caps: Collect numa information
Martin Sivák has posted comments on this change. Change subject: caps: Collect numa information .. Patch Set 12: Code-Review+1 -- To view, visit http://gerrit.ovirt.org/23703 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I63eeb697ab986c3b9cad0dc44f41924f329e52cd Gerrit-PatchSet: 12 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Xiaolei Shi xiao-lei@hp.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Doron Fediuck dfedi...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Gilad Chaplik gchap...@redhat.com Gerrit-Reviewer: Gustavo Frederico Temple Pedrosa gustavo.pedr...@eldorado.org.br Gerrit-Reviewer: Leonardo Bianconi leonardo.bianc...@eldorado.org.br Gerrit-Reviewer: Martin Sivák msi...@redhat.com Gerrit-Reviewer: Michal Skrivanek michal.skriva...@redhat.com Gerrit-Reviewer: Vitor de Lima vitor.l...@eldorado.org.br Gerrit-Reviewer: Xiaolei Shi xiao-lei@hp.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com 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]: netinfo: add bridge option reporting
Antoni Segura Puimedon has uploaded a new change for review. Change subject: netinfo: add bridge option reporting .. netinfo: add bridge option reporting This patch adds reporting of the bridge options that reside in /sys/class/net/bridge_name/bridge/opt_name Change-Id: I91ecc4bb652c5f676e62297aa3d6640bfee596fd Signed-off-by: Antoni S. Puimedon asegu...@redhat.com --- M lib/vdsm/netinfo.py M vdsm_api/vdsmapi-schema.json 2 files changed, 25 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/49/26749/1 diff --git a/lib/vdsm/netinfo.py b/lib/vdsm/netinfo.py index bfc316c..1734966 100644 --- a/lib/vdsm/netinfo.py +++ b/lib/vdsm/netinfo.py @@ -65,6 +65,7 @@ BONDING_MASTERS = '/sys/class/net/bonding_masters' BONDING_SLAVES = '/sys/class/net/%s/bonding/slaves' BONDING_OPT = '/sys/class/net/%s/bonding/%s' +BRIDGING_OPT = '/sys/class/net/%s/bridge/%s' _BONDING_FAILOVER_MODES = frozenset(('1', '3')) _BONDING_LOADBALANCE_MODES = frozenset(('0', '2', '4', '5', '6')) _IFCFG_ZERO_SUFFIXED = frozenset( @@ -176,6 +177,24 @@ with open(path) as optFile: opts[os.path.basename(path)] = [ el for el in optFile.read().rstrip().split(' ') if el] +return opts + + +def bridgeOpts(bridge, keys=None): +Returns a dictionary of bridge option name and value. E.g., +{'max_age': '2000', 'gc_timer': '332'} +BR_KEY_BLACKLIST = ('flush',) +if keys is None: +paths = iglob(BRIDGING_OPT % (bridge, '*')) +else: +paths = (BRIDGING_OPT % (bridge, key) for key in keys) +opts = {} +for path in paths: +key = os.path.basename(path) +if key in BR_KEY_BLACKLIST: +continue +with open(path) as optFile: +opts[key] = optFile.read().rstrip() return opts @@ -512,7 +531,8 @@ info.update({'gateway': getgateway(gateways, link.name), 'ipv6gateway': ipv6routes.get(link.name, '::'), 'ports': ports(link.name), - 'stp': bridge_stp_state(link.name)}) + 'stp': bridge_stp_state(link.name), + 'opts': bridgeOpts(link.name)}) return info diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json index 31bd869..2523df1 100644 --- a/vdsm_api/vdsmapi-schema.json +++ b/vdsm_api/vdsmapi-schema.json @@ -589,6 +589,9 @@ # # @qosOutbound: #optional BandwidthParams for outgoing traffic. # +# @bridge_opts: A map containing information about the bridge specific options. +# (new in version 4.15.0) +# # Since: 4.10.0 # XXX: Add types for IP Address? ## @@ -597,7 +600,7 @@ 'netmask': 'str', 'gateway': 'str', 'ipv6addrs': ['str'], 'ipv6gateway': 'str', 'mtu': 'uint', 'cfg': 'StringMap', 'bridged': 'bool', '*qosInbound': 'BandwidthParams', - '*qosOutbound': 'BandwidthParams'}} + '*qosOutbound': 'BandwidthParams', 'opts': 'StringMap'}} ## # @NetInfoBridgelessNetwork: -- To view, visit http://gerrit.ovirt.org/26749 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I91ecc4bb652c5f676e62297aa3d6640bfee596fd Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon asegu...@redhat.com ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: bridge_opts: Add ifcfg configurator support
oVirt Jenkins CI Server has posted comments on this change. Change subject: bridge_opts: Add ifcfg configurator support .. Patch Set 9: Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8024/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8137/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7234/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_network_functional_tests_gerrit/1258/ : There was an infra issue, please contact in...@ovirt.org -- To view, visit http://gerrit.ovirt.org/26708 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I506538384ce4273630cf5fd18c56b07b09bd4376 Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Lior Vernia lver...@redhat.com 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]: agent: number-of-cpus reporting support
Michal Skrivanek has posted comments on this change. Change subject: agent: number-of-cpus reporting support .. Patch Set 3: Code-Review+1 -- To view, visit http://gerrit.ovirt.org/26530 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I37a4ac7ccf16a7d008f737c16fd1c60293ff2272 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra vfeen...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Michal Skrivanek michal.skriva...@redhat.com Gerrit-Reviewer: Roy Golan rgo...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com 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]: netinfo: add bridge option reporting
oVirt Jenkins CI Server has posted comments on this change. Change subject: netinfo: add bridge option reporting .. Patch Set 1: Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8025/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8138/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7235/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_network_functional_tests_gerrit/1259/ : There was an infra issue, please contact in...@ovirt.org -- To view, visit http://gerrit.ovirt.org/26749 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I91ecc4bb652c5f676e62297aa3d6640bfee596fd Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Lior Vernia lver...@redhat.com Gerrit-Reviewer: Livnat Peer lp...@redhat.com 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]: netinfo: add bridge option reporting
Antoni Segura Puimedon has posted comments on this change. Change subject: netinfo: add bridge option reporting .. Patch Set 2: Verified+1 Manually verified to report the options: Changed multicast_router doing: echo 1 /sys/class/net/tar/bridge/multicast_router and it is correctly reflected as seen below: bridges = {'tar': {'addr': '', 'cfg': {'BOOTPROTO': 'none', 'BRIDGING_OPTS': 'multicast_router=0 multicast_snooping=0', 'DEFROUTE': 'no', 'DELAY': '0', 'DEVICE': 'tar', 'NM_CONTROLLED': 'no', 'ONBOOT': 'yes', 'TYPE': 'Bridge'}, 'gateway': '', 'ipv6addrs': [], 'ipv6gateway': '::', 'mtu': '1500', 'netmask': '', 'opts': {'ageing_time': '29995', 'bridge_id': '8000.', 'forward_delay': '0', 'gc_timer': '53', 'group_addr': '1:80:c2:0:0:0', 'hash_elasticity': '4', 'hash_max': '512', 'hello_time': '199', 'hello_timer': '53', 'max_age': '1999', 'multicast_last_member_count': '2', 'multicast_last_member_interval': '99', 'multicast_membership_interval': '25996', 'multicast_querier': '0', 'multicast_querier_interval': '25496', 'multicast_query_interval': '12498', 'multicast_query_response_interval': '999', 'multicast_router': '1', 'multicast_snooping': '0', 'multicast_startup_query_count': '2', 'multicast_startup_query_interval': '3124', 'priority': '32768', 'root_id': '8000.', 'root_path_cost': '0', 'root_port': '0', 'stp_state': '0', 'tcn_timer': '0', 'topology_change': '0', 'topology_change_detected': '0', 'topology_change_timer': '0'}, -- To view, visit http://gerrit.ovirt.org/26749 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I91ecc4bb652c5f676e62297aa3d6640bfee596fd Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Lior Vernia lver...@redhat.com Gerrit-Reviewer: Livnat Peer lp...@redhat.com 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]: jsonrpc: Stomp support
Saggi Mizrahi has uploaded a new change for review. Change subject: jsonrpc: Stomp support .. jsonrpc: Stomp support The mini broker turned up to be much more work than I expected. This is an intermediate solution. VDSM will accept broker like message but will ignore most of them and not enforce policy. This is so that we can get the engine talking in the correct way and work on the mini broker stress free. This also means that we can release VDSM without the mini broker using a message format that is future ready. It is expected from the engine to send the CONNECT and SUBSCRIBE frames even though VDSM doesn't yet enforce them because future VDSM's probably will. Change-Id: I22bcae1e150dea7bc7d9fecefb6847c48bfe8949 Signed-off-by: Saggi Mizrahi smizr...@redhat.com --- M lib/yajsonrpc/__init__.py M lib/yajsonrpc/betterAsyncore.py A lib/yajsonrpc/stomp.py A lib/yajsonrpc/stompReactor.py M tests/jsonRpcTests.py M tests/jsonRpcUtils.py M vdsm_api/BindingJsonRpc.py 7 files changed, 895 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/50/26750/1 diff --git a/lib/yajsonrpc/__init__.py b/lib/yajsonrpc/__init__.py index fabc5d4..34ff97f 100644 --- a/lib/yajsonrpc/__init__.py +++ b/lib/yajsonrpc/__init__.py @@ -466,6 +466,7 @@ self._threadFactory = threadFactory def queueRequest(self, req): +self.log.debug(Queueing request) self._workQueue.put_nowait(req) def _serveRequest(self, ctx, req): @@ -502,11 +503,14 @@ def serve_requests(self): while True: +self.log.debug(Waiting for request) obj = self._workQueue.get() +self.log.debug(Popped request) if obj is None: break client, msg = obj +self.log.debug(Parsing message) self._parseMessage(client, msg) def _parseMessage(self, client, msg): @@ -560,4 +564,5 @@ self._threadFactory(partial(self._serveRequest, ctx, request)) def stop(self): +self.log.info(Stopping JsonRPC Server) self._workQueue.put_nowait(None) diff --git a/lib/yajsonrpc/betterAsyncore.py b/lib/yajsonrpc/betterAsyncore.py index 8806ee5..1e2c5ba 100644 --- a/lib/yajsonrpc/betterAsyncore.py +++ b/lib/yajsonrpc/betterAsyncore.py @@ -41,6 +41,9 @@ self.connection = connection self.__wctx = wrappedContext +def pending(self): +return self.connection.pending() + def get_context(self): return self.__wctx diff --git a/lib/yajsonrpc/stomp.py b/lib/yajsonrpc/stomp.py new file mode 100644 index 000..3e2ecfb --- /dev/null +++ b/lib/yajsonrpc/stomp.py @@ -0,0 +1,522 @@ +import logging +import socket +import cStringIO +from threading import Timer, Event +from uuid import uuid4 +from collections import deque +import time + +from betterAsyncore import Dispatcher +import asyncore + + +_ESCAPE_CHARS = (('', '\\'), ('\\r', '\r'), ('\\n', '\n'), ('\\c', ':')) + + +class Command: +MESSAGE = MESSAGE +SEND = SEND +SUBSCRIBE = SUBSCRIBE +UNSUBSCRIBE = UNSUBSCRIBE +CONNECT = CONNECT +CONNECTED = CONNECTED +ERROR = ERROR +RECEIPT = RECEIPT + + +class AckMode: +AUTO = auto + + +class StompError(RuntimeError): +def __init__(self, frame): +RuntimeError.__init__(self, frame.body) + + +class Frame(object): +def __init__(self, command=, headers=None, body=None): +self.command = command +if headers is None: +headers = {} + +self.headers = headers +if isinstance(body, unicode): +body = body.encode('utf-8') + +self.body = body + +def encode(self): +body = self.body +# We do it here so we are sure header is up to date +if body is not None: +self.headers[content-length] = len(body) + +data = self.command + '\n' +data += '\n'.join([%s:%s % (encodeValue(key), encodeValue(value)) + for key, value in self.headers.iteritems()]) +data += '\n\n' +if body is not None: +data += body + +data += \0 +return data + +def __repr__(self): +return StompFrame command=%s % (repr(self.command)) + +def copy(self): +return Frame(self.command, self.headers.copy(), self.body) + + +def decodeValue(s): +s = s.decode('utf-8') +for escaped, raw in _ESCAPE_CHARS: +s = s.replace(escaped, raw) + +# TODO : Throw error on invalid escape char +# spec: Undefined escape sequences such as \t (octet 92 and 116) MUST be +# treated as a fatal protocol error. +return s + + +def encodeValue(s): +if not isinstance(s, (str, unicode)): +s = str(s) +for escaped, raw in _ESCAPE_CHARS: +s = s.replace(raw, escaped) + +if isinstance(s, unicode): +s = s.encode('utf-8') + +return s + + +class
Change in vdsm[master]: jsonrpc: Stomp support
oVirt Jenkins CI Server has posted comments on this change. Change subject: jsonrpc: Stomp support .. Patch Set 1: Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8027/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8140/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7237/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/26750 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I22bcae1e150dea7bc7d9fecefb6847c48bfe8949 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi smizr...@redhat.com Gerrit-Reviewer: Barak Azulay bazu...@redhat.com Gerrit-Reviewer: Piotr Kliczewski piotr.kliczew...@gmail.com 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]: netinfo: add bridge option reporting
oVirt Jenkins CI Server has posted comments on this change. Change subject: netinfo: add bridge option reporting .. Patch Set 2: Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8026/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8139/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7236/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_network_functional_tests_gerrit/1260/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/26749 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I91ecc4bb652c5f676e62297aa3d6640bfee596fd Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Lior Vernia lver...@redhat.com Gerrit-Reviewer: Livnat Peer lp...@redhat.com 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]: bridge_opts: Add ifcfg configurator support
oVirt Jenkins CI Server has posted comments on this change. Change subject: bridge_opts: Add ifcfg configurator support .. Patch Set 10: Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8028/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8141/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7238/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_network_functional_tests_gerrit/1261/ : There was an infra issue, please contact in...@ovirt.org -- To view, visit http://gerrit.ovirt.org/26708 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I506538384ce4273630cf5fd18c56b07b09bd4376 Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Lior Vernia lver...@redhat.com 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]: bridge_opts: Add ifcfg configurator support
Antoni Segura Puimedon has posted comments on this change. Change subject: bridge_opts: Add ifcfg configurator support .. Patch Set 10: passed functional tests with tweaked ifup-eth(initscripts). -- To view, visit http://gerrit.ovirt.org/26708 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I506538384ce4273630cf5fd18c56b07b09bd4376 Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Lior Vernia lver...@redhat.com 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]: bridge_opts: Add ifcfg configurator support
oVirt Jenkins CI Server has posted comments on this change. Change subject: bridge_opts: Add ifcfg configurator support .. Patch Set 10: Code-Review-1 Verified-1 Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8028/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8141/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7238/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_network_functional_tests_gerrit/1262/ : The patch does not pass the network functional tests -- To view, visit http://gerrit.ovirt.org/26708 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I506538384ce4273630cf5fd18c56b07b09bd4376 Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Lior Vernia lver...@redhat.com 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]: vm: fix _dom access when QEMU is dying
Michal Skrivanek has posted comments on this change. Change subject: vm: fix _dom access when QEMU is dying .. Patch Set 2: Code-Review+1 -- To view, visit http://gerrit.ovirt.org/26539 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibac9e75a484b228c67d5432b71e965bdf317b89c Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Michal Skrivanek michal.skriva...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com 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]: netinfo: add bridge option reporting
Dan Kenigsberg has posted comments on this change. Change subject: netinfo: add bridge option reporting .. Patch Set 2: Code-Review+2 -- To view, visit http://gerrit.ovirt.org/26749 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I91ecc4bb652c5f676e62297aa3d6640bfee596fd Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Lior Vernia lver...@redhat.com Gerrit-Reviewer: Livnat Peer lp...@redhat.com 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]: agent: number-of-cpus reporting support
Dan Kenigsberg has posted comments on this change. Change subject: agent: number-of-cpus reporting support .. Patch Set 3: Code-Review+2 Vinzenz, please state how this patch was verified. -- To view, visit http://gerrit.ovirt.org/26530 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I37a4ac7ccf16a7d008f737c16fd1c60293ff2272 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra vfeen...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Michal Skrivanek michal.skriva...@redhat.com Gerrit-Reviewer: Roy Golan rgo...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com 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]: agent: number-of-cpus reporting support
Vinzenz Feenstra has posted comments on this change. Change subject: agent: number-of-cpus reporting support .. Patch Set 3: Tested on RHEL6 by using a RHEL6 guest OS with the corresponding (so far still pending) guest agent patch set. The number from the guest was reported as expected in the field. Also this patch has been tested with a guest agent without the aforementioned guest agent patch set to test that this value is not reported. -- To view, visit http://gerrit.ovirt.org/26530 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I37a4ac7ccf16a7d008f737c16fd1c60293ff2272 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra vfeen...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Michal Skrivanek michal.skriva...@redhat.com Gerrit-Reviewer: Roy Golan rgo...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com 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]: agent: number-of-cpus reporting support
Vinzenz Feenstra has posted comments on this change. Change subject: agent: number-of-cpus reporting support .. Patch Set 3: That the value is present in the getAllVmStats was verified with the vdsClient due the fact that there's no other mechanism to check the value, the engine was used as well in this scenario and was not anyhow negatively affected by the presence of the new value. -- To view, visit http://gerrit.ovirt.org/26530 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I37a4ac7ccf16a7d008f737c16fd1c60293ff2272 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra vfeen...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Michal Skrivanek michal.skriva...@redhat.com Gerrit-Reviewer: Roy Golan rgo...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com 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]: jsonrpc: Stomp support
oVirt Jenkins CI Server has posted comments on this change. Change subject: jsonrpc: Stomp support .. Patch Set 2: Build Successful http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8029/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8142/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7239/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/26750 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I22bcae1e150dea7bc7d9fecefb6847c48bfe8949 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi smizr...@redhat.com Gerrit-Reviewer: Barak Azulay bazu...@redhat.com Gerrit-Reviewer: Piotr Kliczewski piotr.kliczew...@gmail.com 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]: bridge_opts: Add ifcfg configurator support
oVirt Jenkins CI Server has posted comments on this change. Change subject: bridge_opts: Add ifcfg configurator support .. Patch Set 10: Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8030/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8143/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7240/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_network_functional_tests_gerrit/1263/ : The patch does not pass the network functional tests -- To view, visit http://gerrit.ovirt.org/26708 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I506538384ce4273630cf5fd18c56b07b09bd4376 Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Lior Vernia lver...@redhat.com 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]: core: removal of unneeded callback passing
Liron Ar has uploaded a new change for review. Change subject: core: removal of unneeded callback passing .. core: removal of unneeded callback passing The callback can be executed from sp.py after completing the operation, eliminating the need to pass it to imageSharing. Change-Id: I5a6e455dc3824f695fab241197ac628713f683a9 Signed-off-by: Liron Aravot lara...@redhat.com --- M vdsm/storage/image.py M vdsm/storage/sp.py 2 files changed, 6 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/60/26760/1 diff --git a/vdsm/storage/image.py b/vdsm/storage/image.py index 44ba822..63dc56a 100644 --- a/vdsm/storage/image.py +++ b/vdsm/storage/image.py @@ -1174,14 +1174,7 @@ finally: domain.deactivateImage(imgUUID) -def downloadFromStream(self, methodArgs, callback, sdUUID, imgUUID, - volUUID=None): -try: -self._downloadFromStream(methodArgs, sdUUID, imgUUID, volUUID) -finally: -callback() - -def _downloadFromStream(self, methodArgs, sdUUID, imgUUID, volUUID=None): +def downloadFromStream(self, methodArgs, sdUUID, imgUUID, volUUID=None): domain = sdCache.produce(sdUUID) vol = self._activateVolumeForImportExport(domain, imgUUID, volUUID) diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index 338232f..4de27d9 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -1639,9 +1639,11 @@ rm.LockType.exclusive) with imgResourceLock: -return image.Image(self.poolPath) \ -.downloadFromStream(methodArgs, callback, sdUUID, imgUUID, -volUUID) +try: +return image.Image(self.poolPath) \ +.downloadFromStream(methodArgs, sdUUID, imgUUID, volUUID) +finally: +callback() def moveMultipleImages(self, srcDomUUID, dstDomUUID, imgDict, vmUUID, force): -- To view, visit http://gerrit.ovirt.org/26760 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5a6e455dc3824f695fab241197ac628713f683a9 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron Ar lara...@redhat.com ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: core: generify streamDownloadImage related methods
Liron Ar has uploaded a new change for review. Change subject: core: generify streamDownloadImage related methods .. core: generify streamDownloadImage related methods This patch generifies the related streamDownloadImage methods in image/imageSharing to be have more generic name as they could be used with any passed fileObj. Change-Id: I1c73374681b5a5fc9fd0cb81020138fb5c8bfe69 Signed-off-by: Liron Aravot lara...@redhat.com --- M vdsm/storage/image.py M vdsm/storage/imageSharing.py M vdsm/storage/sp.py 3 files changed, 9 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/61/26761/1 diff --git a/vdsm/storage/image.py b/vdsm/storage/image.py index 63dc56a..7d5f78d 100644 --- a/vdsm/storage/image.py +++ b/vdsm/storage/image.py @@ -1174,14 +1174,14 @@ finally: domain.deactivateImage(imgUUID) -def downloadFromStream(self, methodArgs, sdUUID, imgUUID, volUUID=None): +def copyToImage(self, methodArgs, sdUUID, imgUUID, volUUID=None): domain = sdCache.produce(sdUUID) vol = self._activateVolumeForImportExport(domain, imgUUID, volUUID) try: # Extend the volume (if relevant) to the image size vol.extend(imageSharing. - streamGetSize(methodArgs) / volume.BLOCK_SIZE) -imageSharing.streamDownloadImage(vol.getVolumePath(), methodArgs) + getLengthFromArgs(methodArgs) / volume.BLOCK_SIZE) +imageSharing.copyToImage(vol.getVolumePath(), methodArgs) finally: domain.deactivateImage(imgUUID) diff --git a/vdsm/storage/imageSharing.py b/vdsm/storage/imageSharing.py index 8f150f3..47d2bb1 100644 --- a/vdsm/storage/imageSharing.py +++ b/vdsm/storage/imageSharing.py @@ -60,7 +60,7 @@ return size -def streamGetSize(methodArgs): +def getLengthFromArgs(methodArgs): return methodArgs['contentLength'] @@ -74,21 +74,16 @@ methodArgs.get(headers, {})) -def streamDownloadImage(dstImgPath, methodArgs): -bytes_left = streamGetSize(methodArgs) -stream = methodArgs['fileObj'] +def copyToImage(dstImgPath, methodArgs): +bytes_left = getLengthFromArgs(methodArgs) +fileObj = methodArgs['fileObj'] cmd = [constants.EXT_DD, of=%s % dstImgPath, bs=%s % constants.MEGAB] p = utils.execCmd(cmd, sudo=False, sync=False, deathSignal=signal.SIGKILL) try: -_copyData(stream, p.stdin, bytes_left) +_copyData(fileObj, p.stdin, bytes_left) _ensureProcessSucceded(p, constants.EXT_DD, se.StorageException) -except Exception: -if p.returncode is None: -p.kill() -raise - except Exception: if p.returncode is None: p.kill() diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index 4de27d9..40feda3 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -1641,7 +1641,7 @@ with imgResourceLock: try: return image.Image(self.poolPath) \ -.downloadFromStream(methodArgs, sdUUID, imgUUID, volUUID) +.copyToImage(methodArgs, sdUUID, imgUUID, volUUID) finally: callback() -- To view, visit http://gerrit.ovirt.org/26761 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1c73374681b5a5fc9fd0cb81020138fb5c8bfe69 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron Ar lara...@redhat.com ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: core: imageSharing - export logic to functions
Liron Ar has uploaded a new change for review. Change subject: core: imageSharing - export logic to functions .. core: imageSharing - export logic to functions Most of the logic within imageSharing.streamDownloadImage() can be exported out to be used by any operation. The logic that was contained in this function is being exported into two functions in this patch: 1. copyData - which can be used to copy data between two file objects. 2. ensureProcessSucceded - which is used to ensure that a process was ended succesfully. Change-Id: I861b40cc62c3332b887b64c2525fc512cdc6a22a Signed-off-by: Liron Aravot lara...@redhat.com --- M vdsm/storage/imageSharing.py 1 file changed, 47 insertions(+), 34 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/59/26759/1 diff --git a/vdsm/storage/imageSharing.py b/vdsm/storage/imageSharing.py index 7166293..8f150f3 100644 --- a/vdsm/storage/imageSharing.py +++ b/vdsm/storage/imageSharing.py @@ -19,7 +19,6 @@ import logging import signal -import socket import curlImgWrap from vdsm import constants @@ -83,39 +82,12 @@ p = utils.execCmd(cmd, sudo=False, sync=False, deathSignal=signal.SIGKILL) try: -while bytes_left 0: -to_read = min(BUFFER_SIZE, bytes_left) - -try: -data = stream.read(to_read) -except socket.timeout: -log.error(socket timeout) -raise se.MiscFileReadException() - -if not data: -total_size = streamGetSize(methodArgs) -log.error(partial data %s from %s, - total_size - bytes_left, total_size) -raise se.MiscFileReadException() - -p.stdin.write(data) -# Process stdin is not a real file object but a wrapper using -# StringIO buffer. To ensure that we don't use more memory if we -# get data faster then dd read it from the pipe, we flush on every -# write. We can remove flush() we can limit the buffer size used -# by this stdin wrapper. -p.stdin.flush() -bytes_left = bytes_left - len(data) - -p.stdin.close() -if not p.wait(WAIT_TIMEOUT): -log.error(timeout waiting for dd process) -raise se.StorageException() - -if p.returncode != 0: -log.error(dd error - code %s, stderr %s, - p.returncode, p.stderr.read(1000)) -raise se.MiscFileWriteException() +_copyData(stream, p.stdin, bytes_left) +_ensureProcessSucceded(p, constants.EXT_DD, se.StorageException) +except Exception: +if p.returncode is None: +p.kill() +raise except Exception: if p.returncode is None: @@ -123,6 +95,47 @@ raise +def _ensureProcessSucceded(p, command, failureException): +if not p.wait(WAIT_TIMEOUT): +log.error(timeout waiting for %s , str(command)) +raise failureException() + +if p.returncode != 0: +log.error(%s error - code %s, stderr %s, + str(command), p.returncode, p.stderr.read(1000)) +raise failureException() + + +def _copyData(inBuffer, outBuffer, bytes_left): +total_size = bytes_left +while bytes_left 0: +to_read = min(BUFFER_SIZE, bytes_left) + +try: +data = inBuffer.read(to_read) +except Exception: +log.error(error while attempting to read input data) +raise se.MiscFileReadException() + +if not data: +log.error(partial data %s from %s, + total_size - bytes_left, total_size) +raise se.MiscFileReadException() + +try: +outBuffer.write(data) +# outBuffer may not be a real file object but a wrapper. +# To ensure that we don't use more memory as the input buffer size +# we flush on every write. +outBuffer.flush() +except Exception: +log.exception(Error while writing data, exc_info=True) +raise se.MiscFileWriteException() + +bytes_left = bytes_left - len(data) + +outBuffer.close() + _METHOD_IMPLEMENTATIONS = { 'http': (httpGetSize, httpDownloadImage, httpUploadImage), } -- To view, visit http://gerrit.ovirt.org/26759 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I861b40cc62c3332b887b64c2525fc512cdc6a22a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron Ar lara...@redhat.com ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: core: introducing retrieveImage
oVirt Jenkins CI Server has posted comments on this change. Change subject: core: introducing retrieveImage .. Patch Set 2: Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8031/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8144/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7241/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/26741 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If2df4d3a16f39bf80281d7669ed31fd8369bada5 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron Ar lara...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com 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]: core: imageSharing - export logic to functions
oVirt Jenkins CI Server has posted comments on this change. Change subject: core: imageSharing - export logic to functions .. Patch Set 1: Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8032/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8145/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7242/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/26759 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I861b40cc62c3332b887b64c2525fc512cdc6a22a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron Ar lara...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com 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]: core: BindingXMLRPC - exporting logic out from do_PUT.
oVirt Jenkins CI Server has posted comments on this change. Change subject: core: BindingXMLRPC - exporting logic out from do_PUT. .. Patch Set 2: Build Successful http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8033/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8146/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7243/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/26740 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I64bb1b0a4cb85ce822929f1907847dd63eb69fc2 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron Ar lara...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com 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]: core: removal of unneeded callback passing
oVirt Jenkins CI Server has posted comments on this change. Change subject: core: removal of unneeded callback passing .. Patch Set 1: Build Successful http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8034/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8147/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7244/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/26760 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5a6e455dc3824f695fab241197ac628713f683a9 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron Ar lara...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com 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]: core: generify streamDownloadImage related methods
oVirt Jenkins CI Server has posted comments on this change. Change subject: core: generify streamDownloadImage related methods .. Patch Set 1: Build Successful http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8035/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8148/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7245/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/26761 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1c73374681b5a5fc9fd0cb81020138fb5c8bfe69 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron Ar lara...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com 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]: bridge_opts: Add iproute2 configurator support
Antoni Segura Puimedon has uploaded a new change for review. Change subject: bridge_opts: Add iproute2 configurator support .. bridge_opts: Add iproute2 configurator support Change-Id: I424676a5c26250fe115a73e745199b5532f71a48 Signed-off-by: Antoni S. Puimedon asegu...@redhat.com --- M vdsm/network/configurators/iproute2.py 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/62/26762/1 diff --git a/vdsm/network/configurators/iproute2.py b/vdsm/network/configurators/iproute2.py index eace5de..542f914 100644 --- a/vdsm/network/configurators/iproute2.py +++ b/vdsm/network/configurators/iproute2.py @@ -35,6 +35,7 @@ from ..errors import ConfigNetworkError, ERR_FAILED_IFUP, ERR_FAILED_IFDOWN from ..models import Nic +_BRIDGING_OPT_PATH = '/sys/class/net/%s/bridge/%s' _ETHTOOL_BINARY = CommandPath( 'ethtool', '/usr/sbin/ethtool', # F19+ @@ -65,6 +66,9 @@ bridge.port.configure(**opts) self.configApplier.addBridgePort(bridge) self.configApplier.setIfaceConfigAndUp(bridge) +if 'custom' in opts and 'bridge_opts' in opts['custom']: +self.configApplied._setBridgeOpts(bridge, + opts['custom']['bridge_opts']) def configureVlan(self, vlan, **opts): vlan.device.configure(**opts) @@ -241,6 +245,11 @@ if rc != 0: raise ConfigNetworkError(ERR_FAILED_IFUP, err) +def _setBridgeOpts(self, bridge, options): +for key, value in (opt.split('=') for opt in options.split(' ')): +with open(_BRIDGING_OPT_PATH % (bridge.name, key)) as optFile: +optFile.write(value) + def removeBridge(self, bridge): rc, _, err = execCmd([EXT_BRCTL, 'delbr', bridge.name]) if rc != 0: -- To view, visit http://gerrit.ovirt.org/26762 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I424676a5c26250fe115a73e745199b5532f71a48 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon asegu...@redhat.com ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: bridge_opts: Add iproute2 configurator support
oVirt Jenkins CI Server has posted comments on this change. Change subject: bridge_opts: Add iproute2 configurator support .. Patch Set 1: Code-Review-1 Verified-1 Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8036/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8149/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7246/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_network_functional_tests_gerrit/1264/ : The patch does not pass the network functional tests -- To view, visit http://gerrit.ovirt.org/26762 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I424676a5c26250fe115a73e745199b5532f71a48 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Lior Vernia lver...@redhat.com Gerrit-Reviewer: Livnat Peer lp...@redhat.com 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]: tests: virt: retry to connect to VDSM at startup
Francesco Romani has posted comments on this change. Change subject: tests: virt: retry to connect to VDSM at startup .. Patch Set 3: Verified+1 Verification: - stopped VDSM - started functional tests - wait 10-15s (roughly) - started VDSM - check tests runned and completed OK -- To view, visit http://gerrit.ovirt.org/26638 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic3a6e9e484d7bf0c506b804131b9e958deff5692 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Michal Skrivanek michal.skriva...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com 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]: schema: publish custom network properties
Dan Kenigsberg has submitted this change and it was merged. Change subject: schema: publish custom network properties .. schema: publish custom network properties This patch makes part of the formal api a network attribute named 'custom' that allows the user to pass a free-form dictionary of attributes that may be used by vdsm or its hooks to perform actions. Change-Id: Ia8461cf9daea7c4b76cbfde05b8e85aeea4195b2 Signed-off-by: Antoni S. Puimedon asegu...@redhat.com Reviewed-on: http://gerrit.ovirt.org/26671 Reviewed-by: Francesco Romani from...@redhat.com Reviewed-by: Douglas Schilling Landgraf dougsl...@redhat.com Reviewed-by: Dan Kenigsberg dan...@redhat.com --- M vdsm_api/vdsmapi-schema.json 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Douglas Schilling Landgraf: Looks good to me, but someone else must approve Antoni Segura Puimedon: Verified Dan Kenigsberg: Looks good to me, approved Francesco Romani: Looks good to me, but someone else must approve -- To view, visit http://gerrit.ovirt.org/26671 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia8461cf9daea7c4b76cbfde05b8e85aeea4195b2 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Lior Vernia lver...@redhat.com Gerrit-Reviewer: Livnat Peer lp...@redhat.com Gerrit-Reviewer: automat...@ovirt.org 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]: schema: publish custom network properties
Dan Kenigsberg has posted comments on this change. Change subject: schema: publish custom network properties .. Patch Set 2: Code-Review+2 -- To view, visit http://gerrit.ovirt.org/26671 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia8461cf9daea7c4b76cbfde05b8e85aeea4195b2 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Lior Vernia lver...@redhat.com Gerrit-Reviewer: Livnat Peer lp...@redhat.com 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]: bridge_opts: Add iproute2 configurator support
Antoni Segura Puimedon has posted comments on this change. Change subject: bridge_opts: Add iproute2 configurator support .. Patch Set 1: Verified+1 Manually tested to: Have the correct settings after doing setupNetworks with: c.setupNetworks({'tar': {'nic': 'eth2', 'custom': {'bridge_opts': 'multicast_router=0 multicast_snooping=0'}} }, {}, {'connectivityCheck': False}) i.e., multicast_router: 0 and multicast_snooping: 0 Verified that setting it works after reboot (when having set the network config as safe). -- To view, visit http://gerrit.ovirt.org/26762 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I424676a5c26250fe115a73e745199b5532f71a48 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Lior Vernia lver...@redhat.com Gerrit-Reviewer: Livnat Peer lp...@redhat.com 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]: bridge_opts: Add iproute2 configurator support
Antoni Segura Puimedon has posted comments on this change. Change subject: bridge_opts: Add iproute2 configurator support .. Patch Set 1: -Verified Sorry, this verification was for the next patch set -- To view, visit http://gerrit.ovirt.org/26762 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I424676a5c26250fe115a73e745199b5532f71a48 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Lior Vernia lver...@redhat.com Gerrit-Reviewer: Livnat Peer lp...@redhat.com 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]: bridge_opts: Add iproute2 configurator support
Antoni Segura Puimedon has posted comments on this change. Change subject: bridge_opts: Add iproute2 configurator support .. Patch Set 2: Verified+1 Verified manually as stated in my previous comment. -- To view, visit http://gerrit.ovirt.org/26762 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I424676a5c26250fe115a73e745199b5532f71a48 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Lior Vernia lver...@redhat.com Gerrit-Reviewer: Livnat Peer lp...@redhat.com 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]: virt: migration: always run migration monitor
Francesco Romani has posted comments on this change. Change subject: virt: migration: always run migration monitor .. Patch Set 12: (3 comments) http://gerrit.ovirt.org/#/c/25975/12//COMMIT_MSG Commit Message: Line 9: Before this patch the migration monitor thread is always Line 10: run, unless the migration monitor interval configuration option Line 11: is explicitely set to zero. Line 12: Line 13: As far as we know, this is rarely done, and there are hidden could you un-hide such an assumption? Well, turns out we currently have just one explicit, being the migrationProgress reporting. Will investigate more to discover if it's just me expecting the monitor always be present, and, given our future goal to leverage migration progress/stall detection to improve the downtime (and general migration behaviour/convergence), if make sense to support the disabling of the migration monitor. Line 14: assumptions scattered in the code about the monitor thread Line 15: always be present. Line 16: Line 17: This patch enforce those assumptions, and let this thread always http://gerrit.ovirt.org/#/c/25975/12/vdsm/virt/migration.py File vdsm/virt/migration.py: Line 394: def run(self): Line 395: if self.enabled: Line 396: self.monitor_migration() Line 397: else: Line 398: self.idle() Could you suggest at least a single case where it is anyhow helpful to have On second thought there is no real value in having this idle loop, and we can simplify the code anyway. Will remove, by pushing the check inside the monitor class. Line 399: Line 400: def monitor_migration(self): Line 401: def calculateProgress(remaining, total): Line 402: if remaining == 0: Line 464: (timeElapsed / 1000, self.progress)) Line 465: Line 466: def idle(self): Line 467: while not self._stop.isSet(): Line 468: time.sleep(1.0) how about self._stop.wait(forever) ? No real need. Will remove. Line 469: Line 470: def stop(self): Line 471: self._vm.log.debug('stopping migration monitor thread') -- To view, visit http://gerrit.ovirt.org/25975 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib4953ddda5a5c6c0ecd7ea0f95377309e18f771a Gerrit-PatchSet: 12 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com 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]: bridge_opts: Add iproute2 configurator support
oVirt Jenkins CI Server has posted comments on this change. Change subject: bridge_opts: Add iproute2 configurator support .. Patch Set 2: Code-Review-1 Verified-1 Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8037/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8150/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7247/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_network_functional_tests_gerrit/1265/ : The patch does not pass the network functional tests -- To view, visit http://gerrit.ovirt.org/26762 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I424676a5c26250fe115a73e745199b5532f71a48 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Lior Vernia lver...@redhat.com Gerrit-Reviewer: Livnat Peer lp...@redhat.com 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]: virt: migration: merge monitor and downtime thread
oVirt Jenkins CI Server has posted comments on this change. Change subject: virt: migration: merge monitor and downtime thread .. Patch Set 15: Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8038/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8151/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7248/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25977 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7ac66331b44435a9cffeb9de1454db6843245979 Gerrit-PatchSet: 15 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com 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]: virt: migration: add monitor thread control loop
oVirt Jenkins CI Server has posted comments on this change. Change subject: virt: migration: add monitor thread control loop .. Patch Set 14: Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8039/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8152/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7249/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25976 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie422bead060c8ba2bfd4bfada522b91d56697841 Gerrit-PatchSet: 14 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com 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]: virt: migration: use contextmanager for monitor
oVirt Jenkins CI Server has posted comments on this change. Change subject: virt: migration: use contextmanager for monitor .. Patch Set 16: Build Successful http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8040/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8153/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7250/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25978 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie7fcd0bedf4f30cc0bcab03339322df1fc5434e8 Gerrit-PatchSet: 16 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com 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]: virt: migration: always run migration monitor
oVirt Jenkins CI Server has posted comments on this change. Change subject: virt: migration: always run migration monitor .. Patch Set 13: Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8041/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8154/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7251/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25975 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib4953ddda5a5c6c0ecd7ea0f95377309e18f771a Gerrit-PatchSet: 13 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com 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]: virt: migration: decouple monitoring from thread
oVirt Jenkins CI Server has posted comments on this change. Change subject: virt: migration: decouple monitoring from thread .. Patch Set 5: Build Successful http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8042/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8155/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7252/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/26279 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I364a9eeb72e3b4213278adff352f3eade19548a3 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com 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]: pep8: fix pep8 1.5.4/1.5.5
Francesco Romani has uploaded a new change for review. Change subject: pep8: fix pep8 1.5.4/1.5.5 .. pep8: fix pep8 1.5.4/1.5.5 pep8 1.5.4/1.5.5 is even more strict than pep8 1.5. This patch fixes all the warnings found by pep8 1.5.5. Change-Id: I34a389df601f24292cd96f48dd8640408ea1da66 Signed-off-by: Francesco Romani from...@redhat.com --- M client/vdsClient.py M tests/functional/storageTests.py M tests/miscTests.py M vds_bootstrap/miniyum.py M vdsm/dmidecodeUtil.py M vdsm/gluster/hooks.py 6 files changed, 27 insertions(+), 27 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/64/26764/1 diff --git a/client/vdsClient.py b/client/vdsClient.py index 9764ea5..e67f330 100644 --- a/client/vdsClient.py +++ b/client/vdsClient.py @@ -182,7 +182,7 @@ elif param == 'guestNumaNodes': guestNumaNodes.append(self._parseDriveSpec(value)) elif param.startswith('custom_'): -if not 'custom' in params: +if 'custom' not in params: params['custom'] = {} params['custom'][param[7:]] = value else: @@ -323,10 +323,10 @@ status = conf['status'] if allStats[vmId].get('monitorResponse') == '-1': status += '*' -print (%-36s %6s %-20s %-20s %-20s % - (vmId, conf.get('pid', 'none'), -conf.get('vmName', ' NO NAME '), -status, allStats[vmId].get('guestIPs', ''))) +print(%-36s %6s %-20s %-20s %-20s % + (vmId, conf.get('pid', 'none'), + conf.get('vmName', ' NO NAME '), + status, allStats[vmId].get('guestIPs', ''))) elif view == 'ids': print conf['vmId'] @@ -420,8 +420,8 @@ vmId = args[0] response = self.s.migrateStatus(vmId) if not response['status']['code']: -print (response['status']['message'] + - ' ' + str(response['progress']) + '%') +print(response['status']['message'] + + ' ' + str(response['progress']) + '%') else: print response['status']['message'] sys.exit(response['status']['code']) @@ -1093,7 +1093,7 @@ for entry in volumes['uuidlist']: message = entry + ' : ' res = self.s.getVolumeInfo(sdUUID, spUUID, imgUUID, entry) -if not 'info' in res: +if 'info' not in res: print 'ERROR:', entry, ':', res continue info = res['info'] @@ -1543,14 +1543,14 @@ spec = spec[1:] while True: -if not spec or not '}' in spec: +if not spec or '}' not in spec: raise Exception(nested spec not terminated with '}' in '%s' % spec) if spec[0] == '}': return d, spec[1:] # Split into first name + the rest -if not ':' in spec: +if ':' not in spec: raise Exception(missing name value separator ':' in '%s' % spec) name, spec = spec.split(:, 1) @@ -1665,8 +1665,8 @@ status = OK if res[imagestatus]: status = ERROR -print (Image %s status %s: %s (%s) % - (imgUUID, status, res[message], res[imagestatus])) +print(Image %s status %s: %s (%s) % + (imgUUID, status, res[message], res[imagestatus])) if badvols in res: for v, err in res[badvols].iteritems(): print \tVolume %s is bad: %s % (v, err) @@ -1676,8 +1676,8 @@ status = OK if res[domainstatus]: status = ERROR -print (Domain %s status %s: %s (%s) % - (sdUUID, status, res[message], res[domainstatus])) +print(Domain %s status %s: %s (%s) % + (sdUUID, status, res[message], res[domainstatus])) if badimages in res: for i in res[badimages]: print \tImage %s is bad % (i) @@ -1688,8 +1688,8 @@ status = OK if res[poolstatus]: status = ERROR -print (Pool %s status %s: %s (%s) % - (spUUID, status, res[message], res[poolstatus])) +print(Pool %s status %s: %s (%s) % + (spUUID, status, res[message], res[poolstatus])) if masterdomain: print \tMaster domain is %s % res[masterdomain] if spmhost: diff --git
Change in vdsm[master]: pep8: fix pep8 1.5.4/1.5.5
oVirt Jenkins CI Server has posted comments on this change. Change subject: pep8: fix pep8 1.5.4/1.5.5 .. Patch Set 1: Code-Review-1 Verified-1 Build Unstable http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8043/ : UNSTABLE http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8156/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7253/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/26764 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I34a389df601f24292cd96f48dd8640408ea1da66 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com 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]: pep8: fix pep8 1.5.4/1.5.5
Francesco Romani has posted comments on this change. Change subject: pep8: fix pep8 1.5.4/1.5.5 .. Patch Set 1: Verified+1 nice! with this patch pep8 1.4.6 complains, pep8 1.5.5 is happy; without this patch, viceversa. :) Verification: gitpydiff is happy with this patch. -- To view, visit http://gerrit.ovirt.org/26764 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I34a389df601f24292cd96f48dd8640408ea1da66 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com 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]: gluster: use the any() builtin
Francesco Romani has uploaded a new change for review. Change subject: gluster: use the any() builtin .. gluster: use the any() builtin use any() instead of 'True' in collection. Tiny cleanup patch found while fixing the complains of pep8 1.5.5. Change-Id: Ieb4bbf6e3ad64d4860f65dcba3fe88fab7472262 Signed-off-by: Francesco Romani from...@redhat.com --- M vdsm/gluster/hooks.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/65/26765/1 diff --git a/vdsm/gluster/hooks.py b/vdsm/gluster/hooks.py index 9a7904f..1d662bc 100644 --- a/vdsm/gluster/hooks.py +++ b/vdsm/gluster/hooks.py @@ -213,11 +213,11 @@ hookLevel.lower(), hookName) hookStat = [os.path.exists(enabledFile), os.path.exists(disabledFile)] if update: -if True not in hookStat: +if not any(hookStat): raise ge.GlusterHookNotFoundException(glusterCmd, hookLevel, hookName) else: -if True in hookStat: +if any(hookStat): raise ge.GlusterHookAlreadyExistException(glusterCmd, hookLevel, hookName) content = base64.b64decode(hookData) -- To view, visit http://gerrit.ovirt.org/26765 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieb4bbf6e3ad64d4860f65dcba3fe88fab7472262 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: use the any() builtin
Francesco Romani has posted comments on this change. Change subject: gluster: use the any() builtin .. Patch Set 1: Verified+1 Verification: fairly trivial, but also trivial to verify, and better safe than sorry $ cat ver.py #!/usr/bin/env python ver = ([ True, True ], [ True, False ], [ False, True ], [ False, False]) # hunk 1 for v in ver: assert((True not in v) == (not any(v))) # hunk 2 for v in ver: assert((True in v) == any(v)) print verified! $ python -V Python 2.7.5 $ python ver.py verified! -- To view, visit http://gerrit.ovirt.org/26765 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ieb4bbf6e3ad64d4860f65dcba3fe88fab7472262 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com 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]: gluster: use the any() builtin
oVirt Jenkins CI Server has posted comments on this change. Change subject: gluster: use the any() builtin .. Patch Set 1: Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8044/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8157/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7254/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/26765 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ieb4bbf6e3ad64d4860f65dcba3fe88fab7472262 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com 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]: gluster: use the any() builtin
oVirt Jenkins CI Server has posted comments on this change. Change subject: gluster: use the any() builtin .. Patch Set 2: Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8045/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8158/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7255/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/26765 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ieb4bbf6e3ad64d4860f65dcba3fe88fab7472262 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com 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]: LiveMerge: Debug blockjob lifecycle
Adam Litke has uploaded a new change for review. Change subject: LiveMerge: Debug blockjob lifecycle .. LiveMerge: Debug blockjob lifecycle Change-Id: I81bfc022d37a6bcdfae6fafdac352e7b40b09d15 Signed-off-by: Adam Litke ali...@redhat.com --- M vdsm/clientIF.py M vdsm/vm.py 2 files changed, 38 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/66/26766/1 diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py index 74f2f47..dc9232d 100644 --- a/vdsm/clientIF.py +++ b/vdsm/clientIF.py @@ -24,6 +24,7 @@ import pickle from xml.dom import minidom import uuid +import json import alignmentScan from vdsm.config import config @@ -233,6 +234,7 @@ binding.start() while self._enabled: time.sleep(3) +self.tickFakeBlockJobs() def _getUUIDSpecPath(self, uuid): try: @@ -571,3 +573,29 @@ v.log.warning('unknown eventid %s args %s', eventid, args) except: self.log.error(Error running VM callback, exc_info=True) + +def getFakeBlockJobs(self): +try: +with open('/tmp/blockJobs.json') as f: +return json.loads(f.read()) +except (IOError, OSError, ValueError): +return {} + +def setFakeBlockJobs(self, jobs): +with open('/tmp/blockJobs.json', 'w') as f: +f.write(json.dumps(jobs)) + +def tickFakeBlockJobs(self): +jobs = self.getFakeBlockJobs() +for jobId in jobs.keys(): +if jobs[jobId]['cur'] = jobs[jobId]['end']: +vmId = jobs[jobId]['vmId'] +path = jobs[jobId]['path'] +del jobs[jobId] +v = self.vmContainer.get(vmId) +v._onBlockJobEvent(path, + libvirt.VIR_DOMAIN_BLOCK_JOB_TYPE_COMMIT, + libvirt.VIR_DOMAIN_BLOCK_JOB_COMPLETED) +else: +jobs[jobId]['cur'] = jobs[jobId]['cur'] + 1 +self.setFakeBlockJobs(jobs) diff --git a/vdsm/vm.py b/vdsm/vm.py index 2f276f4..bb1af71 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -5248,12 +5248,14 @@ # data set is returned from each call. with self._jobsLock: jobs = {} +jobs = self.cif.getFakeBlockJobs() for dev in self.status()['devices']: jobID = dev.get('blockJobID') if dev['device'] != 'disk' or jobID is None: continue ret = self._dom.blockJobInfo(dev['name'], 0) +ret = jobs.get(jobID) if not ret: self.log.debug(Block Job for vm:%s, img:%s has ended, self.conf['vmId'], dev['imageID']) @@ -5266,6 +5268,8 @@ self._postLiveMergeSyncVolumeChain(drive) self.setDiskBlockJobID(dev, None) continue + +self.log.debug(AGLITKE: Found job in dev: %s, dev) jobs[jobID] = {'id': jobID, 'jobType': 'block', 'opType': opTypeMap[ret['type']], @@ -5307,6 +5311,12 @@ self._findAndsetDiskBlockJobID(drive['path'], None) return errCode['mergeErr'] +jobs = self.cif.getFakeBlockJobs() +jobs[jobUUID] = {'type': libvirt.VIR_DOMAIN_BLOCK_JOB_TYPE_COMMIT, + 'cur': 0, 'end': 15, 'bandwidth': 0, + 'vmId': self.conf['vmId'], 'path': drive['path']} +self.cif.setFakeBlockJobs(jobs) + # Trigger the collection of stats before returning so that callers # of getVmStats after this returns will see the new job self._vmStats.sampleVmJobs() -- To view, visit http://gerrit.ovirt.org/26766 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I81bfc022d37a6bcdfae6fafdac352e7b40b09d15 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: revert debug 99faf839011f305da29d5a93a723d8b894102c84
Adam Litke has uploaded a new change for review. Change subject: revert debug 99faf839011f305da29d5a93a723d8b894102c84 .. revert debug 99faf839011f305da29d5a93a723d8b894102c84 Change-Id: I9cd25f15dc7b4523e8bdb5126d93275473701d23 Signed-off-by: Adam Litke ali...@redhat.com --- M vdsm/clientIF.py M vdsm/vm.py 2 files changed, 0 insertions(+), 38 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/67/26767/1 diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py index dc9232d..74f2f47 100644 --- a/vdsm/clientIF.py +++ b/vdsm/clientIF.py @@ -24,7 +24,6 @@ import pickle from xml.dom import minidom import uuid -import json import alignmentScan from vdsm.config import config @@ -234,7 +233,6 @@ binding.start() while self._enabled: time.sleep(3) -self.tickFakeBlockJobs() def _getUUIDSpecPath(self, uuid): try: @@ -573,29 +571,3 @@ v.log.warning('unknown eventid %s args %s', eventid, args) except: self.log.error(Error running VM callback, exc_info=True) - -def getFakeBlockJobs(self): -try: -with open('/tmp/blockJobs.json') as f: -return json.loads(f.read()) -except (IOError, OSError, ValueError): -return {} - -def setFakeBlockJobs(self, jobs): -with open('/tmp/blockJobs.json', 'w') as f: -f.write(json.dumps(jobs)) - -def tickFakeBlockJobs(self): -jobs = self.getFakeBlockJobs() -for jobId in jobs.keys(): -if jobs[jobId]['cur'] = jobs[jobId]['end']: -vmId = jobs[jobId]['vmId'] -path = jobs[jobId]['path'] -del jobs[jobId] -v = self.vmContainer.get(vmId) -v._onBlockJobEvent(path, - libvirt.VIR_DOMAIN_BLOCK_JOB_TYPE_COMMIT, - libvirt.VIR_DOMAIN_BLOCK_JOB_COMPLETED) -else: -jobs[jobId]['cur'] = jobs[jobId]['cur'] + 1 -self.setFakeBlockJobs(jobs) diff --git a/vdsm/vm.py b/vdsm/vm.py index bb1af71..2f276f4 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -5248,14 +5248,12 @@ # data set is returned from each call. with self._jobsLock: jobs = {} -jobs = self.cif.getFakeBlockJobs() for dev in self.status()['devices']: jobID = dev.get('blockJobID') if dev['device'] != 'disk' or jobID is None: continue ret = self._dom.blockJobInfo(dev['name'], 0) -ret = jobs.get(jobID) if not ret: self.log.debug(Block Job for vm:%s, img:%s has ended, self.conf['vmId'], dev['imageID']) @@ -5268,8 +5266,6 @@ self._postLiveMergeSyncVolumeChain(drive) self.setDiskBlockJobID(dev, None) continue - -self.log.debug(AGLITKE: Found job in dev: %s, dev) jobs[jobID] = {'id': jobID, 'jobType': 'block', 'opType': opTypeMap[ret['type']], @@ -5310,12 +5306,6 @@ exc_info=True) self._findAndsetDiskBlockJobID(drive['path'], None) return errCode['mergeErr'] - -jobs = self.cif.getFakeBlockJobs() -jobs[jobUUID] = {'type': libvirt.VIR_DOMAIN_BLOCK_JOB_TYPE_COMMIT, - 'cur': 0, 'end': 15, 'bandwidth': 0, - 'vmId': self.conf['vmId'], 'path': drive['path']} -self.cif.setFakeBlockJobs(jobs) # Trigger the collection of stats before returning so that callers # of getVmStats after this returns will see the new job -- To view, visit http://gerrit.ovirt.org/26767 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9cd25f15dc7b4523e8bdb5126d93275473701d23 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: LiveMerge: Add Image.getVolumeChain API
oVirt Jenkins CI Server has posted comments on this change. Change subject: LiveMerge: Add Image.getVolumeChain API .. Patch Set 5: Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8046/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8159/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7256/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25918 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9e50d7292b98b5dbf1f0978efe5f0de589b3dbc0 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Greg Padgett gpadg...@redhat.com 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]: LiveMerge: Remove old merge APIs
oVirt Jenkins CI Server has posted comments on this change. Change subject: LiveMerge: Remove old merge APIs .. Patch Set 2: Build Successful http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8049/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8162/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7259/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/26632 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I33c4d01e17cf5d2362df25f0ab104a42a485e14f Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com 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]: LiveMerge: Sync volume chain information after live merge
oVirt Jenkins CI Server has posted comments on this change. Change subject: LiveMerge: Sync volume chain information after live merge .. Patch Set 2: Build Successful http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8048/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8161/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7258/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/26636 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib86c19077695354b45818e0186e642ad0e8bc07c Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com 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]: LiveMerge: Add block job info to VM stats
oVirt Jenkins CI Server has posted comments on this change. Change subject: LiveMerge: Add block job info to VM stats .. Patch Set 2: Build Successful http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8050/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8163/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7260/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/26634 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia7278c0f06a2a06c8a8d680cf64746de3f73a389 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com Gerrit-Reviewer: Greg Padgett gpadg...@redhat.com 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]: LiveMerge: Debug blockjob lifecycle
oVirt Jenkins CI Server has posted comments on this change. Change subject: LiveMerge: Debug blockjob lifecycle .. Patch Set 1: Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8052/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8165/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7262/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/26766 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I81bfc022d37a6bcdfae6fafdac352e7b40b09d15 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com 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]: revert debug 99faf839011f305da29d5a93a723d8b894102c84
oVirt Jenkins CI Server has posted comments on this change. Change subject: revert debug 99faf839011f305da29d5a93a723d8b894102c84 .. Patch Set 1: Build Successful http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8053/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8166/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7263/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/26767 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9cd25f15dc7b4523e8bdb5126d93275473701d23 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com 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]: pep8: fix pep8 1.5.4/1.5.5
Antoni Segura Puimedon has posted comments on this change. Change subject: pep8: fix pep8 1.5.4/1.5.5 .. Patch Set 1: Code-Review+1 (1 comment) Looks good, just one suggestion. http://gerrit.ovirt.org/#/c/26764/1/vdsm/dmidecodeUtil.py File vdsm/dmidecodeUtil.py: Line 95: cache=formatData(d['cache']), Line 96: processor=formatData(d['processor']), Line 97: chassis=formatData(d['chassis']), Line 98: memory=formatData(d['memory'])) Line 99: ) Maybe we could get rid of the .format and use the old way we have in the rest of the codebase instead. -- To view, visit http://gerrit.ovirt.org/26764 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I34a389df601f24292cd96f48dd8640408ea1da66 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com 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]: virt: migration: use contextmanager for monitor
Antoni Segura Puimedon has posted comments on this change. Change subject: virt: migration: use contextmanager for monitor .. Patch Set 16: Code-Review+1 -- To view, visit http://gerrit.ovirt.org/25978 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie7fcd0bedf4f30cc0bcab03339322df1fc5434e8 Gerrit-PatchSet: 16 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com 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]: core: Add boot time to the getVdsStats API
Antoni Segura Puimedon has posted comments on this change. Change subject: core: Add boot time to the getVdsStats API .. Patch Set 13: Code-Review-1 (2 comments) Some minor nits (-1 for visibility). http://gerrit.ovirt.org/#/c/25877/13/vdsm/sampling.py File vdsm/sampling.py: Line 156: Line 157: Raises IOError if file access fails, or ValueError if boot time not Line 158: present in file. Line 159: Line 160: with file(_PROC_STAT_PATH) as f: 'file' is deprecated and shouldn't be used. 'open' is the recommended replacement. It is good not to make one letter vars as well. Line 161: for line in f.readlines(): Line 162: if line.startswith('btime'): Line 163: parts = line.split() Line 164: if len(parts) 1: Line 157: Raises IOError if file access fails, or ValueError if boot time not Line 158: present in file. Line 159: Line 160: with file(_PROC_STAT_PATH) as f: Line 161: for line in f.readlines(): why not just: for line in f Do you need to load the whole file in memory at once? Line 162: if line.startswith('btime'): Line 163: parts = line.split() Line 164: if len(parts) 1: Line 165: return int(parts[1]) -- To view, visit http://gerrit.ovirt.org/25877 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I319e619cdaecac2f86d0154e3adbb3beda9c57d6 Gerrit-PatchSet: 13 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Saggi Mizrahi smizr...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com 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]: call stop_event_loop upon exit
Dan Kenigsberg has posted comments on this change. Change subject: call stop_event_loop upon exit .. Patch Set 1: Code-Review-1 (1 comment) http://gerrit.ovirt.org/#/c/26532/1/vdsm/vdsm File vdsm/vdsm: Line 80: while running[0]: Line 81: signal.pause() Line 82: finally: Line 83: cif.prepareForShutdown() Line 84: libvirtconnection.stop_event_loop() not better to put it before the call to prepareForShutdown that can stuck ? I don't really understand why this would be any better. It's nicer to call stop() in the opposite order of calling start (and hence I should take my stop() call out of the finally block. Line 85: Line 86: Line 87: def run(pidfile=None): Line 88: lconfig.fileConfig(loggerConfFile, disable_existing_loggers=False) -- To view, visit http://gerrit.ovirt.org/26532 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab0d9b7be976e37a89a96d2f09a353186008731 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com 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]: LiveMerge: Add support for deleting merged volumes
Adam Litke has uploaded a new change for review. Change subject: LiveMerge: Add support for deleting merged volumes .. LiveMerge: Add support for deleting merged volumes Once a live merge has completed the merged volumes that have previously been marked as illegal need to be deleted. Extend the existing deleteVolume verb to cover this. The main change necessary is to allow deletes to happan for a volume with children as long as it's marked illegal. Since a BlockVolume chain could not be updated when we marked the volumes illegal (since that happened on a non-SPM host) we will fix the chain with this verb as well. Change-Id: Icf43f65f984d7f76622454dc8877d56ef8dedb8f Signed-off-by: Adam Litke ali...@redhat.com --- M vdsm/storage/blockVolume.py M vdsm/storage/volume.py 2 files changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/68/26768/1 diff --git a/vdsm/storage/blockVolume.py b/vdsm/storage/blockVolume.py index 36bfa1f..b5d1c64 100644 --- a/vdsm/storage/blockVolume.py +++ b/vdsm/storage/blockVolume.py @@ -229,6 +229,12 @@ if puuid and puuid != volume.BLANK_UUID: pvol = BlockVolume(self.repoPath, self.sdUUID, self.imgUUID, puuid) +# If this volume has a child (ie. after live merge), set the +# child volume's parent to this volume's parent. +if not self.isLeaf(): +child = self.getChildren()[0] +BlockVolume(self.repoPath, self.sdUUID, self.imgUUID, +child).setParent(puuid) pvol.recheckIfLeaf() except Exception as e: eFound = e diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py index 65a0bae..688f198 100644 --- a/vdsm/storage/volume.py +++ b/vdsm/storage/volume.py @@ -530,6 +530,11 @@ # So, there is no reasons to avoid its deletion self.log.warn(Volume %s metadata error (%s), self.volUUID, str(e)) +if not self.isLegal(): +# We will permit an illegal volume to be deleted even if it has +# children. This can happen when we are cleaning up after a live +# merge operation and the image chain needs to be corrected. +return if self.getChildren(): raise se.VolumeImageHasChildren(self) -- To view, visit http://gerrit.ovirt.org/26768 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icf43f65f984d7f76622454dc8877d56ef8dedb8f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: LiveMerge: Sync volume chain information after live merge
oVirt Jenkins CI Server has posted comments on this change. Change subject: LiveMerge: Sync volume chain information after live merge .. Patch Set 3: Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8054/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8167/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7264/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/26636 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib86c19077695354b45818e0186e642ad0e8bc07c Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com 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]: LiveMerge: Add support for deleting merged volumes
oVirt Jenkins CI Server has posted comments on this change. Change subject: LiveMerge: Add support for deleting merged volumes .. Patch Set 1: Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8055/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8168/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7265/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/26768 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icf43f65f984d7f76622454dc8877d56ef8dedb8f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com Gerrit-Reviewer: Greg Padgett gpadg...@redhat.com 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]: pep8: fix pep8 1.5.4/1.5.5
Dan Kenigsberg has posted comments on this change. Change subject: pep8: fix pep8 1.5.4/1.5.5 .. Patch Set 1: Code-Review-1 (1 comment) http://gerrit.ovirt.org/#/c/26764/1/vdsm/dmidecodeUtil.py File vdsm/dmidecodeUtil.py: Line 95: cache=formatData(d['cache']), Line 96: processor=formatData(d['processor']), Line 97: chassis=formatData(d['chassis']), Line 98: memory=formatData(d['memory'])) Line 99: ) Maybe we could get rid of the .format and use the old way we have in the re Or a complete rewrite of printInfo, or its utter deletion. Please do this in its own patch - I 'd rather keep both versions quiet. -- To view, visit http://gerrit.ovirt.org/26764 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I34a389df601f24292cd96f48dd8640408ea1da66 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com 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]: bridge_opts: Add ifcfg configurator support
Dan Kenigsberg has posted comments on this change. Change subject: bridge_opts: Add ifcfg configurator support .. Patch Set 10: Code-Review+2 -- To view, visit http://gerrit.ovirt.org/26708 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I506538384ce4273630cf5fd18c56b07b09bd4376 Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Lior Vernia lver...@redhat.com 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]: bridge_opts: Add iproute2 configurator support
Dan Kenigsberg has posted comments on this change. Change subject: bridge_opts: Add iproute2 configurator support .. Patch Set 2: Code-Review+2 -- To view, visit http://gerrit.ovirt.org/26762 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I424676a5c26250fe115a73e745199b5532f71a48 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Lior Vernia lver...@redhat.com Gerrit-Reviewer: Livnat Peer lp...@redhat.com 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]: task: update the message when running jobs
Federico Simoncelli has uploaded a new change for review. Change subject: task: update the message when running jobs .. task: update the message when running jobs Change-Id: I14983c3cf0a394e01173c31e676bebb14041fcd2 Signed-off-by: Federico Simoncelli fsimo...@redhat.com --- M vdsm/storage/task.py 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/73/26773/1 diff --git a/vdsm/storage/task.py b/vdsm/storage/task.py index 88ab5fa..eed6c9f 100644 --- a/vdsm/storage/task.py +++ b/vdsm/storage/task.py @@ -898,6 +898,8 @@ if not self.state == State.running: raise se.TaskStateError(%s: can't run Jobs in state %s % (self, self.state)) +self._updateResult( +0, 'running {0} job(s)'.format(len(self.jobs)), '') # for now: result is the last job result, jobs are run sequentially for j in self.jobs: if self.aborting(): -- To view, visit http://gerrit.ovirt.org/26773 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I14983c3cf0a394e01173c31e676bebb14041fcd2 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli fsimo...@redhat.com ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: task: remove unused _addTask method
Federico Simoncelli has uploaded a new change for review. Change subject: task: remove unused _addTask method .. task: remove unused _addTask method Change-Id: I1f07ebbde4d59b0ca02896063a3c998cbb95 Signed-off-by: Federico Simoncelli fsimo...@redhat.com --- M vdsm/storage/taskManager.py 1 file changed, 0 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/70/26770/1 diff --git a/vdsm/storage/taskManager.py b/vdsm/storage/taskManager.py index f14fbc4..e247cf8 100644 --- a/vdsm/storage/taskManager.py +++ b/vdsm/storage/taskManager.py @@ -192,15 +192,6 @@ self.log.debug(Return. Response: %s, subRes) return subRes -def _addTask(self, taskID, task): - - Add task to the relevant hash. - -self.log.info(Entry: taskID=%s, task=%s, taskID, task.dumpTask(, )) -Task.validateID(taskID) -self._tasks[taskID] = task -self.log.debug(Return.) - def loadDumpedTasks(self, store): if not os.path.exists(store): self.log.debug(task dump path %s does not exist., store) -- To view, visit http://gerrit.ovirt.org/26770 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1f07ebbde4d59b0ca02896063a3c998cbb95 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli fsimo...@redhat.com ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: task: support scheduleJob without persistency
Federico Simoncelli has uploaded a new change for review. Change subject: task: support scheduleJob without persistency .. task: support scheduleJob without persistency Change-Id: I95b3063048b910dc5994d0a264bf4791e98fef51 Signed-off-by: Federico Simoncelli fsimo...@redhat.com --- M vdsm/storage/hsm.py M vdsm/storage/taskManager.py 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/71/26771/1 diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index 9040d79..397bbb6 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -412,8 +412,7 @@ self.domainStateChangeCallbacks.add(callbackFunc) def _hsmSchedule(self, name, func, *args): -self.taskMng.scheduleJob(hsm, self.tasksDir, vars.task, - name, func, *args) +self.taskMng.scheduleJob(hsm, None, vars.task, name, func, *args) def __validateLvmLockingType(self): diff --git a/vdsm/storage/taskManager.py b/vdsm/storage/taskManager.py index e247cf8..4a7a04f 100644 --- a/vdsm/storage/taskManager.py +++ b/vdsm/storage/taskManager.py @@ -61,7 +61,8 @@ def scheduleJob(self, type, store, task, jobName, func, *args): task.setTag(type) -task.setPersistence(store, cleanPolicy=TaskCleanType.manual) +if store is not None: +task.setPersistence(store, cleanPolicy=TaskCleanType.manual) task.setManager(self) task.setRecoveryPolicy(auto) task.addJob(Job(jobName, func, *args)) -- To view, visit http://gerrit.ovirt.org/26771 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I95b3063048b910dc5994d0a264bf4791e98fef51 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli fsimo...@redhat.com ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: dispatcher: use a wrapper instead of Protect
Federico Simoncelli has uploaded a new change for review. Change subject: dispatcher: use a wrapper instead of Protect .. dispatcher: use a wrapper instead of Protect Change-Id: Ia7a1a2f88238cb4b845e62de0c1f12e462a4ae72 Signed-off-by: Federico Simoncelli fsimo...@redhat.com --- M vdsm/storage/dispatcher.py 1 file changed, 41 insertions(+), 56 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/74/26774/1 diff --git a/vdsm/storage/dispatcher.py b/vdsm/storage/dispatcher.py index da838e8..6586492 100644 --- a/vdsm/storage/dispatcher.py +++ b/vdsm/storage/dispatcher.py @@ -19,67 +19,14 @@ # import logging +from functools import wraps from vdsm.config import config import task import storage_exception as se + _EXPORTED_ATTRIBUTE = __dispatcher_exported__ - - -class Protect: -STATUS_OK = {'status': {'code': 0, 'message': OK}} -STATUS_ERROR = {'status': {'code': 100, 'message': ERROR}} -log = logging.getLogger('Storage.Dispatcher.Protect') - -def __init__(self, func, name): -self.name = name -self.func = func - -self.help = None -try: -if hasattr(func.im_self, help): -self.help = getattr(func.im_self, help) -except: -pass - -if not self.help: -try: -self.help = getattr(func, __doc__) -except: -pass - -if not self.help: -self.help = No help available for method %s % name - -def run(self, *args, **kwargs): -try: -ctask = task.Task(id=None, name=self.name) -try: -response = self.STATUS_OK.copy() -result = ctask.prepare(self.func, *args, **kwargs) -if type(result) == dict: -response.update(result) -return response -except se.GeneralException as e: -self.log.error(e.response()) -return e.response() -except BaseException as e: -self.log.error(e, exc_info=True) -defaultException = ctask.defaultException -if defaultException and hasattr(defaultException, response): -resp = defaultException.response() -defaultExceptionInfo = (resp['status']['code'], -resp['status']['message']) -return se.generateResponse(e, defaultExceptionInfo) - -return se.generateResponse(e) -except: -try: -self.log.error(Unhandled exception in run and protect: %s, - args: %s , self.name, args, exc_info=True) -finally: -return self.STATUS_ERROR.copy() def exported(f): @@ -89,6 +36,9 @@ class Dispatcher: log = logging.getLogger('Storage.Dispatcher') + +STATUS_OK = {'status': {'code': 0, 'message': OK}} +STATUS_ERROR = {'status': {'code': 100, 'message': ERROR}} def __init__(self, obj): self._obj = obj @@ -110,7 +60,42 @@ continue # Create a new entry in instance's dict that will mask the # original method -setattr(self, funcName, Protect(funcObj, funcName).run) +setattr(self, funcName, self.protect(funcObj, funcName)) + +def protect(self, func, name, *args, **kwargs): +@wraps(func) +def wrapper(*args, **kwargs): +try: +ctask = task.Task(id=None, name=name) +try: +response = self.STATUS_OK.copy() +result = ctask.prepare(func, *args, **kwargs) +if type(result) == dict: +response.update(result) +return response +except se.GeneralException as e: +self.log.error(e.response()) +return e.response() +except BaseException as e: +self.log.error(e, exc_info=True) +defaultException = ctask.defaultException +if (defaultException and +hasattr(defaultException, response)): +resp = defaultException.response() +defaultExceptionInfo = (resp['status']['code'], +resp['status']['message']) +return se.generateResponse(e, defaultExceptionInfo) + +return se.generateResponse(e) +except: +try: +self.log.error( +Unhandled exception in run and protect: %s, +args: %s , self.name, args, exc_info=True) +finally: +return self.STATUS_ERROR.copy() + +
Change in vdsm[master]: hsm: use _hsmSchedule for spmStart
Federico Simoncelli has uploaded a new change for review. Change subject: hsm: use _hsmSchedule for spmStart .. hsm: use _hsmSchedule for spmStart Change-Id: I578f3bc2360e291b05b38e64e8c8bad87e5cd753 Signed-off-by: Federico Simoncelli fsimo...@redhat.com --- M vdsm/storage/hsm.py 1 file changed, 2 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/72/26772/1 diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index 397bbb6..39a6a12 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -65,7 +65,6 @@ from threadLocal import vars from vdsm import constants from storageConstants import STORAGE -from task import Job from resourceFactories import IMAGE_NAMESPACE import resourceManager as rm import devicemapper @@ -580,12 +579,8 @@ # but seeing as it would break the API with Engine, # it's easiest to fail. self.validateNotSPM(spUUID) - -vars.task.setTag(hsm) -vars.task.setManager(self.taskMng) -vars.task.setRecoveryPolicy(auto) -vars.task.addJob(Job(spmStart, pool.startSpm, prevID, prevLVER, - maxHostID, domVersion)) +self._hsmSchedule(spmStart, pool.startSpm, prevID, prevLVER, + maxHostID, domVersion) @public def spmStop(self, spUUID, options=None): -- To view, visit http://gerrit.ovirt.org/26772 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I578f3bc2360e291b05b38e64e8c8bad87e5cd753 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli fsimo...@redhat.com ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: task: remove unused _addTask method
oVirt Jenkins CI Server has posted comments on this change. Change subject: task: remove unused _addTask method .. Patch Set 1: Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8056/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8169/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7266/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/26770 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1f07ebbde4d59b0ca02896063a3c998cbb95 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli fsimo...@redhat.com 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]: task: support scheduleJob without persistency
oVirt Jenkins CI Server has posted comments on this change. Change subject: task: support scheduleJob without persistency .. Patch Set 1: Build Successful http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8057/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8170/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7267/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/26771 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I95b3063048b910dc5994d0a264bf4791e98fef51 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli fsimo...@redhat.com 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]: hsm: use _hsmSchedule for spmStart
oVirt Jenkins CI Server has posted comments on this change. Change subject: hsm: use _hsmSchedule for spmStart .. Patch Set 1: Build Successful http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8058/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8171/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7268/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/26772 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I578f3bc2360e291b05b38e64e8c8bad87e5cd753 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli fsimo...@redhat.com 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]: task: update the message when running jobs
oVirt Jenkins CI Server has posted comments on this change. Change subject: task: update the message when running jobs .. Patch Set 1: Build Successful http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8059/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8172/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7269/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/26773 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I14983c3cf0a394e01173c31e676bebb14041fcd2 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli fsimo...@redhat.com 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]: dispatcher: use a wrapper instead of Protect
oVirt Jenkins CI Server has posted comments on this change. Change subject: dispatcher: use a wrapper instead of Protect .. Patch Set 1: Build Successful http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8060/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8173/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7270/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/26774 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia7a1a2f88238cb4b845e62de0c1f12e462a4ae72 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli fsimo...@redhat.com 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.4]: packaging: add qemu user to cdrom group
Yaniv Bronhaim has posted comments on this change. Change subject: packaging: add qemu user to cdrom group .. Patch Set 1: i waited to see if dan is satisfied by the verification -- To view, visit http://gerrit.ovirt.org/26705 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I44d842e7b1df073c33284b51185e29ce0d02a0e0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.4 Gerrit-Owner: Sandro Bonazzola sbona...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Sandro Bonazzola sbona...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Zhou Zheng Sheng zhshz...@linux.vnet.ibm.com 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.4]: packaging: add qemu user to cdrom group
Yaniv Bronhaim has submitted this change and it was merged. Change subject: packaging: add qemu user to cdrom group .. packaging: add qemu user to cdrom group Allow to boot VMs from host CD-ROM. Change-Id: I44d842e7b1df073c33284b51185e29ce0d02a0e0 Bug-Url: https://bugzilla.redhat.com/1082028 Signed-off-by: Sandro Bonazzola sbona...@redhat.com Reviewed-on: http://gerrit.ovirt.org/26541 Reviewed-by: Dan Kenigsberg dan...@redhat.com Reviewed-on: http://gerrit.ovirt.org/26705 Reviewed-by: Yaniv Bronhaim ybron...@redhat.com --- M configure.ac M debian/vdsm.postinst M vdsm.spec.in 3 files changed, 7 insertions(+), 0 deletions(-) Approvals: Sandro Bonazzola: Verified Yaniv Bronhaim: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/26705 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I44d842e7b1df073c33284b51185e29ce0d02a0e0 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.4 Gerrit-Owner: Sandro Bonazzola sbona...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Sandro Bonazzola sbona...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Zhou Zheng Sheng zhshz...@linux.vnet.ibm.com Gerrit-Reviewer: automat...@ovirt.org 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[ovirt-3.4]: packaging: add qemu user to cdrom group
oVirt Jenkins CI Server has posted comments on this change. Change subject: packaging: add qemu user to cdrom group .. Patch Set 2: Build Successful http://jenkins.ovirt.org/job/vdsm_3.4_install_rpm_sanity_gerrit/33/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/26705 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I44d842e7b1df073c33284b51185e29ce0d02a0e0 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.4 Gerrit-Owner: Sandro Bonazzola sbona...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Sandro Bonazzola sbona...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Zhou Zheng Sheng zhshz...@linux.vnet.ibm.com 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]: Adding skiptests for LibvirtModuleConfigureTests
Yaniv Bronhaim has uploaded a new change for review. Change subject: Adding skiptests for LibvirtModuleConfigureTests .. Adding skiptests for LibvirtModuleConfigureTests We're getting repeated segmentation fault on jenkins job. Until solving the issue, keeping branch tests stable. Change-Id: I95cb5178af8f718dd3f0a1d72e74962a898983a6 Signed-off-by: Yaniv Bronhaim ybron...@redhat.com --- M tests/toolTests.py 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/75/26775/1 diff --git a/tests/toolTests.py b/tests/toolTests.py index 2fc8c61..86197ac 100644 --- a/tests/toolTests.py +++ b/tests/toolTests.py @@ -21,6 +21,7 @@ from vdsm import utils import monkeypatch from unittest import TestCase +from nose.plugins.skip import SkipTest import tempfile import os @@ -160,6 +161,9 @@ self.assertFalse(libvirtConfigure.isconfigured()) def testLibvirtConfigureToSSLTrue(self): +# skip test after getting repeated seg fault in jenkins jobs +raise SkipTest(Skipping failed test) + libvirtConfigure = configurator.LibvirtModuleConfigure(test_env) self._setConfig('LCONF', 'empty') self._setConfig('VDSM_CONF_FILE', 'withssl') @@ -168,6 +172,9 @@ self.assertTrue(libvirtConfigure.isconfigured()) def testLibvirtConfigureToSSLFalse(self): +# skip test after getting repeated seg fault in jenkins jobs +raise SkipTest(Skipping failed test) + libvirtConfigure = configurator.LibvirtModuleConfigure(test_env) self._setConfig('LCONF', 'empty') self._setConfig('VDSM_CONF_FILE', 'withnossl') -- To view, visit http://gerrit.ovirt.org/26775 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I95cb5178af8f718dd3f0a1d72e74962a898983a6 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybron...@redhat.com ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Adding skiptests for LibvirtModuleConfigureTests
oVirt Jenkins CI Server has posted comments on this change. Change subject: Adding skiptests for LibvirtModuleConfigureTests .. Patch Set 1: Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8061/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8174/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7271/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/26775 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I95cb5178af8f718dd3f0a1d72e74962a898983a6 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: mooli tayer mta...@redhat.com 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]: call stop_event_loop upon exit
Yaniv Bronhaim has posted comments on this change. Change subject: call stop_event_loop upon exit .. Patch Set 1: post new version. +1 for the order -- To view, visit http://gerrit.ovirt.org/26532 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ab0d9b7be976e37a89a96d2f09a353186008731 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com 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]: Adding skiptests for LibvirtModuleConfigureTests
oVirt Jenkins CI Server has posted comments on this change. Change subject: Adding skiptests for LibvirtModuleConfigureTests .. Patch Set 2: Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8062/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8175/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7272/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/26775 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I95cb5178af8f718dd3f0a1d72e74962a898983a6 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybron...@redhat.com 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]: Adding skiptests for LibvirtModuleConfigureTests
Yaniv Bronhaim has posted comments on this change. Change subject: Adding skiptests for LibvirtModuleConfigureTests .. Patch Set 2: Code-Review-1 interesting .. it gives a bit more info, ill try to figure it -- To view, visit http://gerrit.ovirt.org/26775 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I95cb5178af8f718dd3f0a1d72e74962a898983a6 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com 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]: oop: Add an option to configure oop implementation
Yaniv Bronhaim has posted comments on this change. Change subject: oop: Add an option to configure oop implementation .. Patch Set 2: too odd to have such config.. if its mandatory to all run, why not currently keep both on code, but make it configurable hardcoded (as constant or something just for developing tests). such usage is not meant to be controlled by the user -- To view, visit http://gerrit.ovirt.org/26576 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibd756afd43d23631dc7ed4bac64bec9a81b358b4 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Saggi Mizrahi smizr...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com 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]: open: Change file() to open()
Dima Kuznetsov has uploaded a new change for review. Change subject: open: Change file() to open() .. open: Change file() to open() Update file calls to open calls due to file's deprecation. Change-Id: I80007044be1c648ebb668704731eae8b83366025 Signed-off-by: Dima Kuznetsov dkuzn...@redhat.com --- M vdsm/API.py M vdsm/hooks.py M vdsm/storage/fileUtils.py M vdsm/storage/hba.py M vdsm/virt/sampling.py M vdsm_hooks/nestedvt/before_vm_start.py 6 files changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/76/26776/1 diff --git a/vdsm/API.py b/vdsm/API.py index 94b39b6..6724559 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -185,8 +185,8 @@ # parmas were stored. fname = self._cif.prepareVolumePath(paramFilespec) try: -with file(fname) as f: -pickledMachineParams = pickle.load(f) +with open(fname) as file: +pickledMachineParams = pickle.load(file) if type(pickledMachineParams) == dict: self.log.debug('loaded pickledMachineParams ' + diff --git a/vdsm/hooks.py b/vdsm/hooks.py index 75f33f9..ba7bad7 100644 --- a/vdsm/hooks.py +++ b/vdsm/hooks.py @@ -341,8 +341,8 @@ def _getScriptInfo(path): try: -with file(path) as f: -md5 = hashlib.md5(f.read()).hexdigest() +with open(path) as file: +md5 = hashlib.md5(file.read()).hexdigest() except: md5 = '' return {'md5': md5} diff --git a/vdsm/storage/fileUtils.py b/vdsm/storage/fileUtils.py index 56dc1ef..4ffe113 100644 --- a/vdsm/storage/fileUtils.py +++ b/vdsm/storage/fileUtils.py @@ -401,6 +401,6 @@ def padToBlockSize(path): -with file(path, 'a') as f: -size = os.fstat(f.fileno()).st_size -os.ftruncate(f.fileno(), 512 * ((size + 511) / 512)) +with open(path, 'a') as file: +size = os.fstat(file.fileno()).st_size +os.ftruncate(file.fileno(), 512 * ((size + 511) / 512)) diff --git a/vdsm/storage/hba.py b/vdsm/storage/hba.py index da3feef..b649f6c 100644 --- a/vdsm/storage/hba.py +++ b/vdsm/storage/hba.py @@ -43,8 +43,8 @@ hbas = [] try: -with file(ISCSI_INITIATOR_NAME) as f: -for line in f: +with open(ISCSI_INITIATOR_NAME) as file: +for line in file: if line.startswith(INITIATOR_NAME): hba = {'InitiatorName': line.split(=)[1].strip()} hbas.append(hba) diff --git a/vdsm/virt/sampling.py b/vdsm/virt/sampling.py index 991c969..ed8f58e 100644 --- a/vdsm/virt/sampling.py +++ b/vdsm/virt/sampling.py @@ -189,8 +189,8 @@ self.cpuLoad = '0.0' self.diskStats = self._getDiskStats() try: -with file(_THP_STATE_PATH) as f: -s = f.read() +with open(_THP_STATE_PATH) as file: +s = file.read() self.thpState = s[s.index('[') + 1:s.index(']')] except: self.thpState = 'never' diff --git a/vdsm_hooks/nestedvt/before_vm_start.py b/vdsm_hooks/nestedvt/before_vm_start.py index 03f0f6f..d4fb806 100755 --- a/vdsm_hooks/nestedvt/before_vm_start.py +++ b/vdsm_hooks/nestedvt/before_vm_start.py @@ -29,8 +29,8 @@ for kvm_mod in (kvm_intel, kvm_amd): kvm_mod_path = /sys/module/%s/parameters/nested % kvm_mod try: -with file(kvm_mod_path) as f: -if f.readline().strip() in (Y, 1): +with open(kvm_mod_path) as file: +if file.readline().strip() in (Y, 1): break except IOError: pass -- To view, visit http://gerrit.ovirt.org/26776 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I80007044be1c648ebb668704731eae8b83366025 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: core: Add boot time to the getVdsStats API
Dima Kuznetsov has posted comments on this change. Change subject: core: Add boot time to the getVdsStats API .. Patch Set 13: (2 comments) http://gerrit.ovirt.org/#/c/25877/13/vdsm/sampling.py File vdsm/sampling.py: Line 156: Line 157: Raises IOError if file access fails, or ValueError if boot time not Line 158: present in file. Line 159: Line 160: with file(_PROC_STAT_PATH) as f: 'file' is deprecated and shouldn't be used. 'open' is the recommended repla Done also, take a look at http://gerrit.ovirt.org/#/c/26776/ Line 161: for line in f.readlines(): Line 162: if line.startswith('btime'): Line 163: parts = line.split() Line 164: if len(parts) 1: Line 157: Raises IOError if file access fails, or ValueError if boot time not Line 158: present in file. Line 159: Line 160: with file(_PROC_STAT_PATH) as f: Line 161: for line in f.readlines(): why not just: Done Line 162: if line.startswith('btime'): Line 163: parts = line.split() Line 164: if len(parts) 1: Line 165: return int(parts[1]) -- To view, visit http://gerrit.ovirt.org/25877 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I319e619cdaecac2f86d0154e3adbb3beda9c57d6 Gerrit-PatchSet: 13 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Saggi Mizrahi smizr...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com 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]: open: Change file() to open()
oVirt Jenkins CI Server has posted comments on this change. Change subject: open: Change file() to open() .. Patch Set 1: Build Successful http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8063/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8176/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7273/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/26776 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I80007044be1c648ebb668704731eae8b83366025 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com 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]: core: Add boot time to the getVdsStats API
oVirt Jenkins CI Server has posted comments on this change. Change subject: core: Add boot time to the getVdsStats API .. Patch Set 14: Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8064/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8177/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7274/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25877 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I319e619cdaecac2f86d0154e3adbb3beda9c57d6 Gerrit-PatchSet: 14 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Saggi Mizrahi smizr...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com 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]: open: Change file() to open()
Antoni Segura Puimedon has posted comments on this change. Change subject: open: Change file() to open() .. Patch Set 1: Code-Review+1 Thanks for this. It was long overdue that we'd get rid of the 'file' calling. The only downside is that expanding 'f' to 'file' shadows the file callable (which is considered a bad practice), though since it is shadowing something for which there is little legitimate use, I'm ok with it. -- To view, visit http://gerrit.ovirt.org/26776 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I80007044be1c648ebb668704731eae8b83366025 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com 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]: core: Add boot time to the getVdsStats API
Antoni Segura Puimedon has posted comments on this change. Change subject: core: Add boot time to the getVdsStats API .. Patch Set 14: Code-Review+1 -- To view, visit http://gerrit.ovirt.org/25877 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I319e619cdaecac2f86d0154e3adbb3beda9c57d6 Gerrit-PatchSet: 14 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Dima Kuznetsov dkuzn...@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Saggi Mizrahi smizr...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com 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