[NEW PATCH] BZ#730778 - Add timeout when acquiring resources in prepareVolume (via gerrit-bot)

New patch submitted by Saggi Mizrahi (smizrahi(a)redhat.com)

You can review this change at: http://gerrit.usersys.redhat.com/859

commit b89e3c611a2d8e696f8c0477769828e93dd91664
Author: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Date:   Sun Aug 28 11:52:05 2011 +0300

    BZ#730778 - Add timeout when acquiring resources in prepareVolume
    
    Change-Id: I1bbe6ea0ff82a4af3c728f520546870324363c44

diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index f83316c..f063f87 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -1697,8 +1697,9 @@ class HSM:
         vars.task.getSharedLock(STORAGE, sdUUID)
         imageResourcesNamespace = sd.getNamespace(sdUUID, IMAGE_NAMESPACE)
         lockType = rm.LockType.exclusive if rw else rm.LockType.shared
+        timeout = config.getint('irs', 'task_resource_default_timeout')
 
-        imgResource = rmanager.acquireResource(imageResourcesNamespace, imgUUID,
lockType)
+        imgResource = rmanager.acquireResource(imageResourcesNamespace, imgUUID,
lockType, timeout)
         try:
             vol = SDF.produce(sdUUID=sdUUID).produceVolume(imgUUID=imgUUID,
volUUID=volUUID)
             # NB We want to be sure that at this point HSM does not use stale LVM

Change in vdsm[master]: BZ#730778 - Add timeout when acquiring resources in prepareV...

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: BZ#730778 - Add timeout when acquiring resources in prepareVolume
......................................................................


Patch Set 4: Verified; Looks good to me, approved

Grrr no thanks Saggi for not stacking this on top of
     
Change-Id: I7f204831f0fd3875651f4718ec529cb8f0dcccaf
Reviewed-on: http://gerrit.usersys.redhat.com/915

--
To view, visit http://gerrit.usersys.redhat.com/859
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I1bbe6ea0ff82a4af3c728f520546870324363c44
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Ayal Baron
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: David Naori <dnaori(a)redhat.com&gt;
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com&gt;
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com&gt;

Change in vdsm[master]: BZ#730778 - Add timeout when acquiring resources in prepareV...

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: BZ#730778 - Add timeout when acquiring resources in prepareVolume
......................................................................


BZ#730778 - Add timeout when acquiring resources in prepareVolume

Also added seperate timeout for prepare volume operations because they
might take longer

Change-Id: I1bbe6ea0ff82a4af3c728f520546870324363c44
---
M vdsm/config.py
M vdsm/storage/hsm.py
M vdsm/storage/resourceFactories.py
3 files changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Dan Kenigsberg: Verified; Looks good to me, approved


--
To view, visit http://gerrit.usersys.redhat.com/859
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1bbe6ea0ff82a4af3c728f520546870324363c44
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Ayal Baron
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: David Naori <dnaori(a)redhat.com&gt;
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com&gt;
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com&gt;

Change in vdsm[master]: BZ#730778 - Add timeout when acquiring resources in prepareV...

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: BZ#730778 - Add timeout when acquiring resources in prepareVolume
......................................................................


Patch Set 3: Looks good to me, approved

--
To view, visit http://gerrit.usersys.redhat.com/859
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I1bbe6ea0ff82a4af3c728f520546870324363c44
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Ayal Baron
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: David Naori <dnaori(a)redhat.com&gt;
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com&gt;
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com&gt;

Change in vdsm[master]: BZ#730778 - Add timeout when acquiring resources in prepareV...

[David Naori]

David Naori has posted comments on this change.

Change subject: BZ#730778 - Add timeout when acquiring resources in prepareVolume
......................................................................


Patch Set 3: Verified

--
To view, visit http://gerrit.usersys.redhat.com/859
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I1bbe6ea0ff82a4af3c728f520546870324363c44
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Ayal Baron
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: David Naori <dnaori(a)redhat.com&gt;
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com&gt;
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com&gt;

Change in vdsm[master]: BZ#730778 - Add timeout when acquiring resources in prepareV...

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: BZ#730778 - Add timeout when acquiring resources in prepareVolume
......................................................................


Patch Set 2:

grrr, I meant to ask to stack this one with change 915, since I want to take them
together.

--
To view, visit http://gerrit.usersys.redhat.com/859
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I1bbe6ea0ff82a4af3c728f520546870324363c44
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Ayal Baron
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com&gt;
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com&gt;

Change in vdsm[master]: BZ#730778 - Add timeout when acquiring resources in prepareV...

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: BZ#730778 - Add timeout when acquiring resources in prepareVolume
......................................................................


Patch Set 2:

And please rebase over change 859, since I want to take them together.

--
To view, visit http://gerrit.usersys.redhat.com/859
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I1bbe6ea0ff82a4af3c728f520546870324363c44
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Ayal Baron
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com&gt;
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com&gt;

Change in vdsm[master]: BZ#730778 - Add timeout when acquiring resources in prepareV...

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: BZ#730778 - Add timeout when acquiring resources in prepareVolume
......................................................................


Patch Set 2: I would prefer that you didn't submit this

(2 inline comments)

....................................................
File vdsm/config.py
Line 162: config.set('irs', 'prepare_image_timeout', '6000000')
didn't we agree about 10 minutes?
I see here 100 minutes.

....................................................
File vdsm/storage/hsm.py
Line 1702:         timeout = config.getint('irs', 'prepare_image_timeout')
/ 1000
1000.0

(we do not really care for milliseconds in this timeout, but let's avoid unneeded
rounding, and keep consistent with resourceFactory.py)

we ALL missed that on the former patch you've passed milliseconds as seconds..

--
To view, visit http://gerrit.usersys.redhat.com/859
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I1bbe6ea0ff82a4af3c728f520546870324363c44
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Ayal Baron
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com&gt;
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com&gt;

Change in vdsm[master]: BZ#730778 - Add timeout when acquiring resources in prepareV...

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: BZ#730778 - Add timeout when acquiring resources in prepareVolume
......................................................................


Patch Set 1: I would prefer that you didn't submit this

I am a bit worried regarding side effects of this on multiple migration.

--
To view, visit http://gerrit.usersys.redhat.com/859
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I1bbe6ea0ff82a4af3c728f520546870324363c44
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Ayal Baron
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com&gt;
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com&gt;

Change in vdsm[master]: BZ#730778 - Add timeout when acquiring resources in prepareV...

Saggi Mizrahi has posted comments on this change.

Change subject: BZ#730778 - Add timeout when acquiring resources in prepareVolume
......................................................................


Patch Set 1: Verified

--
To view, visit http://gerrit.usersys.redhat.com/859
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I1bbe6ea0ff82a4af3c728f520546870324363c44
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Ayal Baron
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com&gt;
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com&gt;

Change in vdsm[master]: BZ#730778 - Add timeout when acquiring resources in prepareV...

[Igor Lvovsky]

Igor Lvovsky has posted comments on this change.

Change subject: BZ#730778 - Add timeout when acquiring resources in prepareVolume
......................................................................


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

Who is verified it?

--
To view, visit http://gerrit.usersys.redhat.com/859
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I1bbe6ea0ff82a4af3c728f520546870324363c44
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com&gt;