Change in vdsm[master]: hsm: Fix missing MAX_DOMAINS constant

[Nir Soffer]

Nir Soffer has uploaded a new change for review.

Change subject: hsm: Fix missing MAX_DOMAINS constant
......................................................................

hsm: Fix missing MAX_DOMAINS constant

Commit ab6014b394 moved MAX_DOMAINS from sp to spbackends without
updating all users, breaking creation of a pool on block storage using
old storage domain format. This patch fix the error by importing the
name from its new module.

Change-Id: I772b01be4de309aa4b15bf2c89e69b64787e1a11
Signed-off-by: Nir Soffer 
---
M vdsm/storage/hsm.py
1 file changed, 2 insertions(+), 2 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/42/24242/1

diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index 53c9dd0..5efa4ec 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -40,7 +40,7 @@

from vdsm.config import config
 import sp
-from spbackends import MAX_POOL_DESCRIPTION_SIZE
+from spbackends import MAX_POOL_DESCRIPTION_SIZE, MAX_DOMAINS
 from spbackends import StoragePoolDiskBackend
 from spbackends import StoragePoolMemoryBackend
 import domainMonitor
@@ -948,7 +948,7 @@
         msdVersion = msd.getVersion()
         if (msdType in sd.BLOCK_DOMAIN_TYPES and
                 msdVersion in blockSD.VERS_METADATA_LV and
-                len(domList) > sp.MAX_DOMAINS):
+                len(domList) > MAX_DOMAINS):
             raise se.TooManyDomainsInStoragePoolError()

for sdUUID in domList:

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: hsm: Fix missing MAX_DOMAINS constant
......................................................................

Patch Set 1: Verified-1

Build Failed

http://jenkins.ovirt.org/job/vdsm_storage_functional_tests_localfs/132/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6266/ : SUCCESS

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

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7156/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_storage_functional_tests_nfs/71/ : FAILURE

[Nir Soffer]

Nir Soffer has posted comments on this change.

Change subject: hsm: Fix missing MAX_DOMAINS constant
......................................................................

Patch Set 1:

I guess this needs a backport to rhev-3.3.x.

[Nir Soffer]

Nir Soffer has posted comments on this change.

Change subject: hsm: Fix missing MAX_DOMAINS constant
......................................................................

Patch Set 2:

Add bug url

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: hsm: Fix missing MAX_DOMAINS constant
......................................................................

Patch Set 2:

Build Failed

http://jenkins.ovirt.org/job/vdsm_storage_functional_tests_localfs/133/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6267/ : SUCCESS

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

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7157/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_storage_functional_tests_nfs/72/ : FAILURE

Yaniv Bronhaim has posted comments on this change.

Change subject: hsm: Fix missing MAX_DOMAINS constant
......................................................................

Patch Set 2: Code-Review+1

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: hsm: Fix missing MAX_DOMAINS constant
......................................................................

Patch Set 2: Code-Review+2

[Nir Soffer]

Nir Soffer has posted comments on this change.

Change subject: hsm: Fix missing MAX_DOMAINS constant
......................................................................

Patch Set 2: Verified+1

Verified by creating domain with version 1 and attaching to new empty data center.

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: hsm: Fix missing MAX_DOMAINS constant
......................................................................

hsm: Fix missing MAX_DOMAINS constant

Commit ab6014b394 moved MAX_DOMAINS from sp to spbackends without
updating all users, breaking creation of a pool on block storage using
old storage domain format. This patch fix the error by importing the
name from its new module.

Change-Id: I772b01be4de309aa4b15bf2c89e69b64787e1a11
Bug-Url: https://bugzilla.redhat.com/1059108
Signed-off-by: Nir Soffer 
Reviewed-on: http://gerrit.ovirt.org/24242
Reviewed-by: Yaniv Bronhaim 
Reviewed-by: Dan Kenigsberg 
---
M vdsm/storage/hsm.py
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Nir Soffer: Verified
  Yaniv Bronhaim: Looks good to me, but someone else must approve
  Dan Kenigsberg: Looks good to me, approved