Change in vdsm[master]: Fix return value of shutdown() on failure

Mark Wu has uploaded a new change for review.

Change subject: Fix return value of shutdown() on failure
......................................................................

Fix return value of shutdown() on failure

Change-Id: Ice01a8db664c8c1a3ca32c15de4865f362e7210e
Signed-off-by: Mark Wu 
---
M vdsm/vm.py
1 file changed, 2 insertions(+), 0 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/34/5434/1
--
To view, visit http://gerrit.ovirt.org/5434
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice01a8db664c8c1a3ca32c15de4865f362e7210e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu

Ewoud Kohl van Wijngaarden has posted comments on this change.

Change subject: Fix return value of shutdown() on failure
......................................................................

Patch Set 1: Looks good to me, but someone else must approve

--
To view, visit http://gerrit.ovirt.org/5434
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ice01a8db664c8c1a3ca32c15de4865f362e7210e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu 
Gerrit-Reviewer: Ewoud Kohl van Wijngaarden

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: Fix return value of shutdown() on failure
......................................................................

Patch Set 1: Looks good to me, but someone else must approve

I suppose you are right here - but I would like someone from Engine to take a look if fixing this Vdsm bug has negative effects on them.

--
To view, visit http://gerrit.ovirt.org/5434
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ice01a8db664c8c1a3ca32c15de4865f362e7210e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Ewoud Kohl van Wijngaarden 
Gerrit-Reviewer: Omer Frenkel

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Fix return value of shutdown() on failure
......................................................................

Patch Set 1: No score

Build Started http://jenkins.ovirt.info/job/vdsm_unit_tests_by_patch/120/

--
To view, visit http://gerrit.ovirt.org/5434
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ice01a8db664c8c1a3ca32c15de4865f362e7210e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Ewoud Kohl van Wijngaarden 
Gerrit-Reviewer: Omer Frenkel 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Fix return value of shutdown() on failure
......................................................................

Patch Set 1:

Build Successful

http://jenkins.ovirt.info/job/vdsm_unit_tests_by_patch/120/ : SUCCESS

--
To view, visit http://gerrit.ovirt.org/5434
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ice01a8db664c8c1a3ca32c15de4865f362e7210e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Ewoud Kohl van Wijngaarden 
Gerrit-Reviewer: Omer Frenkel 
Gerrit-Reviewer: oVirt Jenkins CI Server

Mark Wu has posted comments on this change.

Change subject: Fix return value of shutdown() on failure
......................................................................

Patch Set 1:

Doron, 
Could you please check if this fix could cause negative effect to engine side?  Thanks!~

--
To view, visit http://gerrit.ovirt.org/5434
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ice01a8db664c8c1a3ca32c15de4865f362e7210e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Doron Fediuck 
Gerrit-Reviewer: Ewoud Kohl van Wijngaarden 
Gerrit-Reviewer: Mark Wu 
Gerrit-Reviewer: Omer Frenkel 
Gerrit-Reviewer: oVirt Jenkins CI Server

ShaoHe Feng has posted comments on this change.

Change subject: Fix return value of shutdown() on failure
......................................................................

Patch Set 1: Looks good to me, but someone else must approve

--
To view, visit http://gerrit.ovirt.org/5434
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ice01a8db664c8c1a3ca32c15de4865f362e7210e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Doron Fediuck 
Gerrit-Reviewer: Ewoud Kohl van Wijngaarden 
Gerrit-Reviewer: Mark Wu 
Gerrit-Reviewer: Omer Frenkel 
Gerrit-Reviewer: ShaoHe Feng 
Gerrit-Reviewer: oVirt Jenkins CI Server

Hunt Xu has posted comments on this change.

Change subject: Fix return value of shutdown() on failure
......................................................................

Patch Set 1: Looks good to me, but someone else must approve

--
To view, visit http://gerrit.ovirt.org/5434
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ice01a8db664c8c1a3ca32c15de4865f362e7210e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Doron Fediuck 
Gerrit-Reviewer: Ewoud Kohl van Wijngaarden 
Gerrit-Reviewer: Hunt Xu 
Gerrit-Reviewer: Mark Wu 
Gerrit-Reviewer: Omer Frenkel 
Gerrit-Reviewer: ShaoHe Feng 
Gerrit-Reviewer: oVirt Jenkins CI Server

Doron Fediuck has posted comments on this change.

Change subject: Fix return value of shutdown() on failure
......................................................................

Patch Set 1:

Mark,
How do I reproduce this?

--
To view, visit http://gerrit.ovirt.org/5434
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ice01a8db664c8c1a3ca32c15de4865f362e7210e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Doron Fediuck 
Gerrit-Reviewer: Ewoud Kohl van Wijngaarden 
Gerrit-Reviewer: Hunt Xu 
Gerrit-Reviewer: Mark Wu 
Gerrit-Reviewer: Omer Frenkel 
Gerrit-Reviewer: ShaoHe Feng 
Gerrit-Reviewer: oVirt Jenkins CI Server

Mark Wu has posted comments on this change.

Change subject: Fix return value of shutdown() on failure
......................................................................

Patch Set 1:

Doron, 
I didn't really hit this bug and just found it from code review.  It returns None if an exception raises shutdown. 
I am not sure how engine will handle this case. Do I need raise an exception intentionally to see what will happen?

--
To view, visit http://gerrit.ovirt.org/5434
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ice01a8db664c8c1a3ca32c15de4865f362e7210e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Doron Fediuck 
Gerrit-Reviewer: Ewoud Kohl van Wijngaarden 
Gerrit-Reviewer: Hunt Xu 
Gerrit-Reviewer: Mark Wu 
Gerrit-Reviewer: Omer Frenkel 
Gerrit-Reviewer: ShaoHe Feng 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: Fix return value of shutdown() on failure
......................................................................

Patch Set 1: Looks good to me, approved

Trying to return None is like the worst thing an xmlrpc server can do. Your fix cannot be worse.

I would be content if this is verified to work when you change the code to raise an exception.

--
To view, visit http://gerrit.ovirt.org/5434
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ice01a8db664c8c1a3ca32c15de4865f362e7210e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Doron Fediuck 
Gerrit-Reviewer: Ewoud Kohl van Wijngaarden 
Gerrit-Reviewer: Hunt Xu 
Gerrit-Reviewer: Mark Wu 
Gerrit-Reviewer: Omer Frenkel 
Gerrit-Reviewer: ShaoHe Feng 
Gerrit-Reviewer: oVirt Jenkins CI Server

Ewoud Kohl van Wijngaarden has posted comments on this change.

Change subject: Fix return value of shutdown() on failure
......................................................................

Patch Set 1:

If I read it correct in the old situation it will log the error and then fall through to the normal return telling the engine it worked (unless doneCode['code'] contains the error code). This is changed to an explicit error message, but it didn't return None.

--
To view, visit http://gerrit.ovirt.org/5434
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ice01a8db664c8c1a3ca32c15de4865f362e7210e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Doron Fediuck 
Gerrit-Reviewer: Ewoud Kohl van Wijngaarden 
Gerrit-Reviewer: Hunt Xu 
Gerrit-Reviewer: Mark Wu 
Gerrit-Reviewer: Omer Frenkel 
Gerrit-Reviewer: ShaoHe Feng 
Gerrit-Reviewer: oVirt Jenkins CI Server

Ewoud Kohl van Wijngaarden has posted comments on this change.

Change subject: Fix return value of shutdown() on failure
......................................................................

Patch Set 2: Looks good to me, but someone else must approve

I assume patch set 2 is just a rebase.

--
To view, visit http://gerrit.ovirt.org/5434
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ice01a8db664c8c1a3ca32c15de4865f362e7210e
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Doron Fediuck 
Gerrit-Reviewer: Ewoud Kohl van Wijngaarden 
Gerrit-Reviewer: Hunt Xu 
Gerrit-Reviewer: Mark Wu 
Gerrit-Reviewer: Omer Frenkel 
Gerrit-Reviewer: ShaoHe Feng 
Gerrit-Reviewer: oVirt Jenkins CI Server

Hunt Xu has posted comments on this change.

Change subject: Fix return value of shutdown() on failure
......................................................................

Patch Set 2: Looks good to me, but someone else must approve

--
To view, visit http://gerrit.ovirt.org/5434
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ice01a8db664c8c1a3ca32c15de4865f362e7210e
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Doron Fediuck 
Gerrit-Reviewer: Ewoud Kohl van Wijngaarden 
Gerrit-Reviewer: Hunt Xu 
Gerrit-Reviewer: Mark Wu 
Gerrit-Reviewer: Omer Frenkel 
Gerrit-Reviewer: ShaoHe Feng 
Gerrit-Reviewer: oVirt Jenkins CI Server

Mark Wu has posted comments on this change.

Change subject: Fix return value of shutdown() on failure
......................................................................

Patch Set 2: Verified

I intentionally add a raise in the try block in shutdown(). Without this patch, it returns done. I see the following message on engine:

2012-12-04 12:44:41,532 INFO  [org.ovirt.engine.core.bll.ShutdownVmCommand] (pool-3-thread-49) [51c3ad1a] VmHandler.cs:ShutdownVmCommand:Perform: entered (Desktop vm1).
2012-12-04 12:44:41,532 INFO  [org.ovirt.engine.core.bll.ShutdownVmCommand] (pool-3-thread-49) [51c3ad1a] VmHandler.cs:ShutdownVmCommand:Perform: sending shutdown command for Desktop vm1.
2012-12-04 12:44:41,533 INFO  [org.ovirt.engine.core.vdsbroker.DestroyVmVDSCommand] (pool-3-thread-49) [51c3ad1a] START, DestroyVmVDSCommand(vdsId = 3f6bb242-3d26-11e2-b1fc-0021cc68d738, vmId=00ed0570-a015-4fbc-9a87-ccb84d2b6d9d, force=false, secondsToWait=30, gracefully=true), log id: c936590
2012-12-04 12:44:41,536 INFO  [org.ovirt.engine.core.vdsbroker.vdsbroker.DestroyVDSCommand] (pool-3-thread-49) [51c3ad1a] START, DestroyVDSCommand(vdsId = 3f6bb242-3d26-11e2-b1fc-0021cc68d738, vmId=00ed0570-a015-4fbc-9a87-ccb84d2b6d9d, force=false, secondsToWait=30, gracefully=true), log id: 21ecf202
2012-12-04 12:44:41,636 INFO  [org.ovirt.engine.core.vdsbroker.vdsbroker.DestroyVDSCommand] (pool-3-thread-49) [51c3ad1a] FINISH, DestroyVDSCommand, log id: 21ecf202
2012-12-04 12:44:41,646 INFO  [org.ovirt.engine.core.vdsbroker.DestroyVmVDSCommand] (pool-3-thread-49) [51c3ad1a] FINISH, DestroyVmVDSCommand, return: PoweringDown, log id: c936590

With this patch, it returns correct error code.

2012-12-04 12:51:40,164 INFO  [org.ovirt.engine.core.bll.ShutdownVmCommand] (pool-3-thread-49) [24855d03] VmHandler.cs:ShutdownVmCommand:Perform: sending shutdown command for Desktop vm1.
2012-12-04 12:51:40,164 INFO  [org.ovirt.engine.core.vdsbroker.DestroyVmVDSCommand] (pool-3-thread-49) [24855d03] START, DestroyVmVDSCommand(vdsId = 3f6bb242-3d26-11e2-b1fc-0021cc68d738, vmId=00ed0570-a015-4fbc-9a87-ccb84d2b6d9d, force=false, secondsToWait=30, gracefully=true), log id: 3c3b6966
2012-12-04 12:51:40,168 INFO  [org.ovirt.engine.core.vdsbroker.vdsbroker.DestroyVDSCommand] (pool-3-thread-49) [24855d03] START, DestroyVDSCommand(vdsId = 3f6bb242-3d26-11e2-b1fc-0021cc68d738, vmId=00ed0570-a015-4fbc-9a87-ccb84d2b6d9d, force=false, secondsToWait=30, gracefully=true), log id: 3328b5d0
2012-12-04 12:51:40,190 ERROR [org.ovirt.engine.core.vdsbroker.vdsbroker.BrokerCommandBase] (pool-3-thread-49) [24855d03] Failed in DestroyVDS method
2012-12-04 12:51:40,190 ERROR [org.ovirt.engine.core.vdsbroker.vdsbroker.BrokerCommandBase] (pool-3-thread-49) [24855d03] Error code exist and error message VDSGenericException: VDSErrorException: Failed to DestroyVDS, error = Failed to shutdown VM. Try Forced Shutdown.
2012-12-04 12:51:40,191 INFO  [org.ovirt.engine.core.vdsbroker.vdsbroker.BrokerCommandBase] (pool-3-thread-49) [24855d03] Command org.ovirt.engine.core.vdsbroker.vdsbroker.DestroyVDSCommand return value
 Class Name: org.ovirt.engine.core.vdsbroker.vdsbroker.StatusOnlyReturnForXmlRpc
mStatus                       Class Name: org.ovirt.engine.core.vdsbroker.vdsbroker.StatusForXmlRpc
mCode                         4
mMessage                      Failed to shutdown VM. Try Forced Shutdown.

2012-12-04 12:51:40,191 INFO  [org.ovirt.engine.core.vdsbroker.vdsbroker.BrokerCommandBase] (pool-3-thread-49) [24855d03] Vds: Host1
2012-12-04 12:51:40,192 ERROR [org.ovirt.engine.core.vdsbroker.VDSCommandBase] (pool-3-thread-49) [24855d03] Command DestroyVDS execution failed. Exception: VDSErrorException: VDSGenericException: VDSErrorException: Failed to DestroyVDS, error = Failed to shutdown VM. Try Forced Shutdown.

So I think it's verified.

--
To view, visit http://gerrit.ovirt.org/5434
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ice01a8db664c8c1a3ca32c15de4865f362e7210e
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Doron Fediuck 
Gerrit-Reviewer: Ewoud Kohl van Wijngaarden 
Gerrit-Reviewer: Hunt Xu 
Gerrit-Reviewer: Mark Wu 
Gerrit-Reviewer: Omer Frenkel 
Gerrit-Reviewer: ShaoHe Feng 
Gerrit-Reviewer: oVirt Jenkins CI Server

Shu Ming has posted comments on this change.

Change subject: Fix return value of shutdown() on failure
......................................................................

Patch Set 2: Looks good to me, but someone else must approve

--
To view, visit http://gerrit.ovirt.org/5434
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ice01a8db664c8c1a3ca32c15de4865f362e7210e
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Doron Fediuck 
Gerrit-Reviewer: Ewoud Kohl van Wijngaarden 
Gerrit-Reviewer: Hunt Xu 
Gerrit-Reviewer: Mark Wu 
Gerrit-Reviewer: Omer Frenkel 
Gerrit-Reviewer: ShaoHe Feng 
Gerrit-Reviewer: Shu Ming 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: Fix return value of shutdown() on failure
......................................................................

Patch Set 2: Looks good to me, approved

Thanks!

--
To view, visit http://gerrit.ovirt.org/5434
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ice01a8db664c8c1a3ca32c15de4865f362e7210e
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Doron Fediuck 
Gerrit-Reviewer: Ewoud Kohl van Wijngaarden 
Gerrit-Reviewer: Hunt Xu 
Gerrit-Reviewer: Mark Wu 
Gerrit-Reviewer: Omer Frenkel 
Gerrit-Reviewer: ShaoHe Feng 
Gerrit-Reviewer: Shu Ming 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: Fix return value of shutdown() on failure
......................................................................

Fix return value of shutdown() on failure

Change-Id: Ice01a8db664c8c1a3ca32c15de4865f362e7210e
Signed-off-by: Mark Wu 
---
M vdsm/vm.py
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Ewoud Kohl van Wijngaarden: Looks good to me, but someone else must approve
  Hunt Xu: Looks good to me, but someone else must approve
  Shu Ming: Looks good to me, but someone else must approve
  Mark Wu: Verified
  Dan Kenigsberg: Looks good to me, approved

--
To view, visit http://gerrit.ovirt.org/5434
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ice01a8db664c8c1a3ca32c15de4865f362e7210e
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Doron Fediuck 
Gerrit-Reviewer: Ewoud Kohl van Wijngaarden 
Gerrit-Reviewer: Hunt Xu 
Gerrit-Reviewer: Mark Wu 
Gerrit-Reviewer: Omer Frenkel 
Gerrit-Reviewer: ShaoHe Feng 
Gerrit-Reviewer: Shu Ming 
Gerrit-Reviewer: oVirt Jenkins CI Server