Change in vdsm[master]: sp: ensure that master domain is active

[Federico Simoncelli]

Federico Simoncelli has uploaded a new change for review.

Change subject: sp: ensure that master domain is active
......................................................................

sp: ensure that master domain is active

Change-Id: I4e8fe07ebf8e59e9b028678fecd0a24578348b6c
Signed-off-by: Federico Simoncelli 
---
M vdsm/storage/sp.py
1 file changed, 5 insertions(+), 2 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/31/28331/1

diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py
index 482bdca..3f983b6 100644
--- a/vdsm/storage/sp.py
+++ b/vdsm/storage/sp.py
@@ -1172,9 +1172,12 @@
         domUUIDs = self.getDomains(activeOnly=True).keys()

# msdUUID should be present and active in getDomains result.
-        # TODO: Consider remove if clause.
-        if msdUUID in domUUIDs:
+        try:
             domUUIDs.remove(msdUUID)
+        except ValueError:
+            self.log.error('master storage domain %s not found in the pool '
+                           'domains or not active', msdUUID)
+            raise se.StoragePoolWrongMaster(self.spUUID, msdUUID)

# TODO: Consider to remove this whole block. UGLY!
         # We want to avoid looking up (vgs) of unknown block domains.

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: sp: ensure that master domain is active
......................................................................

Patch Set 1:

Build Failed

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/9680/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8747/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/9533/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_storage_functional_tests_localfs_ge... : FAILURE

[Federico Simoncelli]

Federico Simoncelli has posted comments on this change.

Change subject: sp: ensure that master domain is active
......................................................................

Patch Set 1:

(1 comment)

http://gerrit.ovirt.org/#/c/28331/1//COMMIT_MSG
Commit Message:

Line 4: Commit:     Federico Simoncelli 
Line 5: CommitDate: 2014-06-03 12:26:56 -0400
Line 6: 
Line 7: sp: ensure that master domain is active
Line 8: 
I'll add more info.
Line 9: Change-Id: I4e8fe07ebf8e59e9b028678fecd0a24578348b6c

[Federico Simoncelli]

Federico Simoncelli has posted comments on this change.

Change subject: sp: ensure that master domain is active
......................................................................

Patch Set 2: Verified+1

Verified:

* it is impossible to connect to a pool where the master domain is attached (and not active)
* other flows seems unaffected (still possible to connect to a regular storage pool)

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: sp: ensure that master domain is active
......................................................................

Patch Set 2:

Build Failed

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/9697/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8764/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/9550/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_storage_functional_tests_localfs_ge... : SUCCESS

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: sp: ensure that master domain is active
......................................................................

Patch Set 2: Code-Review+2

Seems reasonable to me.

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: sp: ensure that master domain is active
......................................................................

sp: ensure that master domain is active

It's not possible to be connected to a pool where the master domain
is attached (and not active).
In case the engine tries to send a domain map (memory backend) in
which the master domain is attached the operation should fail.

Change-Id: I4e8fe07ebf8e59e9b028678fecd0a24578348b6c
Signed-off-by: Federico Simoncelli 
Reviewed-on: http://gerrit.ovirt.org/28331
Reviewed-by: Dan Kenigsberg 
---
M vdsm/storage/sp.py
1 file changed, 5 insertions(+), 2 deletions(-)

Approvals:
  Federico Simoncelli: Verified
  Dan Kenigsberg: Looks good to me, approved

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: sp: ensure that master domain is active
......................................................................

Patch Set 3:

Build Successful

http://jenkins.ovirt.org/job/vdsm_master_create-rpms_merged/1385/ : SUCCESS