Liron Aravot has posted comments on this change. Change subject: vm, guestagent: hash to include also the disk mapping ......................................................................
Patch Set 3: (3 comments) http://gerrit.ovirt.org/#/c/31701/3/vdsm/virt/guestagent.py File vdsm/virt/guestagent.py: Line 121: self._sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) Line 122: self._stopped = True Line 123: self.guestStatus = None Line 124: self.guestDiskMapping = {} Line 125: self.diskMappingHash = 0 > Lets keep the same format used in vm.py - '0' the type in vm.py currently is a string to avoid creating a string from the hash each time, i changed it there as well. see comments on vm.py - if it'll be left as a string there i'll change it here as well. Line 126: self.guestInfo = { Line 127: 'username': user, Line 128: 'memUsage': 0, Line 129: 'guestCPUCount': -1, Line 304: disks.append(disk) Line 305: self.guestInfo['disksUsage'] = disks Line 306: self.guestDiskMapping = args.get('mapping', {}) Line 307: self.diskMappingHash = hash(json.dumps(self.guestDiskMapping, Line 308: sort_keys=True)) > The hash should be a string. hash does return a number, but we should not u same as the other comment in this file. Line 309: elif message == 'number-of-cpus': Line 310: self.guestInfo['guestCPUCount'] = int(args['count']) Line 311: else: Line 312: self.log.error('Unknown message type %s', message) http://gerrit.ovirt.org/#/c/31701/3/vdsm/virt/vm.py File vdsm/virt/vm.py: Line 4514: def _getUnderlyingVmInfo(self): Line 4515: self._lastXMLDesc = self._dom.XMLDesc(0) Line 4516: devxml = _domParseStr(self._lastXMLDesc).childNodes[0]. \ Line 4517: getElementsByTagName('devices')[0] Line 4518: self._devXmlHash = hash(devxml.toxml()) > This change is not needed. basically the idea behind it is that there's no need to convert it to string now, it'll be converted to string in line 2537. Line 4519: Line 4520: return self._lastXMLDesc Line 4521: Line 4522: def _ejectFloppy(self): -- To view, visit http://gerrit.ovirt.org/31701 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I148196ccf353613f9cffed7753e7100bd1dd30de Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron Aravot <lara...@redhat.com> Gerrit-Reviewer: Allon Mureinik <amure...@redhat.com> Gerrit-Reviewer: Federico Simoncelli <fsimo...@redhat.com> Gerrit-Reviewer: Francesco Romani <from...@redhat.com> Gerrit-Reviewer: Liron Aravot <lara...@redhat.com> Gerrit-Reviewer: Michal Skrivanek <mskri...@redhat.com> Gerrit-Reviewer: Nir Soffer <nsof...@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
