Royce Lv has uploaded a new change for review.
Change subject: [WIP]misc clean for supervdsmServer ......................................................................
[WIP]misc clean for supervdsmServer
Change-Id: I6a0cf4be2fc2637df36e2abc4a82ddc1a55f72cd Signed-off-by: Royce Lvlvroyce@linux.vnet.ibm.com --- M vdsm/supervdsmServer.py 1 file changed, 3 insertions(+), 23 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/96/11196/1
diff --git a/vdsm/supervdsmServer.py b/vdsm/supervdsmServer.py index 6cc7725..e0f7ab2 100755 --- a/vdsm/supervdsmServer.py +++ b/vdsm/supervdsmServer.py @@ -44,7 +44,7 @@ from supervdsm import _SuperVdsmManager from storage.fileUtils import chown, resolveGid, resolveUid from storage.fileUtils import validateAccess as _validateAccess -from vdsm.constants import METADATA_GROUP, EXT_UDEVADM, \ +from vdsm.constants import METADATA_USER, METADATA_GROUP, EXT_UDEVADM, \ DISKIMAGE_USER, DISKIMAGE_GROUP, P_LIBVIRT_VMCHANNELS, P_VDSM_RUN from storage.devicemapper import _removeMapping, _getPathsStatus import configNetwork @@ -336,7 +336,6 @@ def __udevOperationReload(self): return self.__udevVersion() > self.UDEV_WITH_RELOAD_VERSION
- def initLogger(): try: logging.config.fileConfig(LOG_CONF_PATH) @@ -368,32 +367,14 @@ 'gluster%s%s' % (name[0].upper(), name[1:]), logDecorator(bind(func)))
- try: - logging.config.fileConfig(LOG_CONF_PATH) - except: - logging.basicConfig(filename='/dev/stdout', filemode='w+', - level=logging.DEBUG) - log = logging.getLogger("SuperVdsm.Server") - log.warn("Could not init proper logging", exc_info=True)
- log = logging.getLogger("SuperVdsm.Server") signal.signal(signal.SIGTERM, sigtermHandler)
try: + log = initLogger() log.debug("Making sure I'm root") if os.geteuid() != 0: sys.exit(errno.EPERM) - - log.debug("Parsing cmd args") - authkey, parentPid, pidfile, timestamp, address, uid = sys.argv[1:] - - log.debug("Creating PID and TIMESTAMP files: %s, %s", - pidfile, timestamp) - spid = os.getpid() - with open(pidfile, "w") as f: - f.write(str(spid) + "\n") - with open(timestamp, "w") as f: - f.write(str(misc.getProcCtime(spid) + "\n"))
log.debug("Cleaning old socket %s", address) if os.path.exists(address): @@ -411,8 +392,7 @@ servThread.setDaemon(True) servThread.start()
- for f in (address, timestamp, pidfile): - chown(f, int(uid), METADATA_GROUP) + chown(address, METADATA_USER, METADATA_GROUP)
log.debug("Started serving super vdsm object")
-- To view, visit http://gerrit.ovirt.org/11196 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange Gerrit-Change-Id: I6a0cf4be2fc2637df36e2abc4a82ddc1a55f72cd Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv lvroyce@linux.vnet.ibm.com
oVirt Jenkins CI Server has posted comments on this change.
Change subject: [WIP]misc clean for supervdsmServer ......................................................................
Patch Set 1:
Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/808/ (1/2)
-- To view, visit http://gerrit.ovirt.org/11196 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I6a0cf4be2fc2637df36e2abc4a82ddc1a55f72cd Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: [WIP]misc clean for supervdsmServer ......................................................................
Patch Set 1:
Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/843/ (2/2)
-- To view, visit http://gerrit.ovirt.org/11196 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I6a0cf4be2fc2637df36e2abc4a82ddc1a55f72cd Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: [WIP]misc clean for supervdsmServer ......................................................................
Patch Set 1: Fails; I would prefer that you didn't submit this
Build Failed
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/808/ : UNSTABLE
http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/843/ : FAILURE
-- To view, visit http://gerrit.ovirt.org/11196 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I6a0cf4be2fc2637df36e2abc4a82ddc1a55f72cd Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: [WIP]misc clean for supervdsmServer ......................................................................
Patch Set 2:
Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/811/ (2/2)
-- To view, visit http://gerrit.ovirt.org/11196 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I6a0cf4be2fc2637df36e2abc4a82ddc1a55f72cd Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: [WIP]misc clean for supervdsmServer ......................................................................
Patch Set 2:
Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/846/ (1/2)
-- To view, visit http://gerrit.ovirt.org/11196 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I6a0cf4be2fc2637df36e2abc4a82ddc1a55f72cd Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: [WIP]misc clean for supervdsmServer ......................................................................
Patch Set 2: Fails
Build Failed
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/811/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/846/ : FAILURE
-- To view, visit http://gerrit.ovirt.org/11196 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I6a0cf4be2fc2637df36e2abc4a82ddc1a55f72cd Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: [WIP]misc clean for supervdsmServer ......................................................................
Patch Set 3:
Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/853/ (1/2)
-- To view, visit http://gerrit.ovirt.org/11196 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I6a0cf4be2fc2637df36e2abc4a82ddc1a55f72cd Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: [WIP]misc clean for supervdsmServer ......................................................................
Patch Set 3:
Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/818/ (2/2)
-- To view, visit http://gerrit.ovirt.org/11196 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I6a0cf4be2fc2637df36e2abc4a82ddc1a55f72cd Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: [WIP]misc clean for supervdsmServer ......................................................................
Patch Set 3:
Build Successful
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/818/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/853/ : SUCCESS
-- To view, visit http://gerrit.ovirt.org/11196 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I6a0cf4be2fc2637df36e2abc4a82ddc1a55f72cd Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server
Royce Lv has posted comments on this change.
Change subject: [WIP]misc clean for supervdsmServer ......................................................................
Patch Set 3:
tested: start,stop service, kill vdsm,kill svdsm
Known BUGS: libvirt event loop not reply to keepalive message and event loop connection broken after several mins.
-- To view, visit http://gerrit.ovirt.org/11196 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I6a0cf4be2fc2637df36e2abc4a82ddc1a55f72cd Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Royce Lv has abandoned this change.
Change subject: [WIP]misc clean for supervdsmServer ......................................................................
Patch Set 3: Abandoned
-- To view, visit http://gerrit.ovirt.org/11196 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: abandon Gerrit-Change-Id: I6a0cf4be2fc2637df36e2abc4a82ddc1a55f72cd Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Royce Lv lvroyce@linux.vnet.ibm.com Gerrit-Reviewer: Yaniv Bronhaim ybronhei@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
vdsm-patches@lists.fedorahosted.org