[NEW PATCH] BZ#717225 - Check version consistency only for data SDs. (via gerrit-bot)

New patch submitted by Eduardo Warszawski (ewarszaw(a)redhat.com)

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

commit e28ddaaf199569c1669e300648626e442afb4b2d
Author: Eduardo Warszawski <ewarszaw(a)redhat.com&gt;
Date:   Tue Jun 28 16:34:37 2011 +0300

    BZ#717225 - Check version consistency only for data SDs.
    
    Change-Id: I71d692685f53b1834651c6c49f3c30c5a3b95230

diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index 52e3bbd..7fcc618 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -470,7 +470,8 @@ class HSM:
                 dom.validate()
             except:
                 raise se.StorageDomainAccessError(sdUUID)
-            if dom.getVersion() != msdVersion:
+            #If you remove this cndition, remove it from StoragePool.attachSD() too.
+            if dom.isData() and (dom.getVersion() != msdVersion):
                 raise se.MixedSDVersionError(dom.sdUUID, dom.getVersion(), msd.sdUUID,
msdVersion)
 
         vars.task.getExclusiveLock(STORAGE, spUUID)
diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py
index 6a4ced5..c377ee4 100644
--- a/vdsm/storage/sp.py
+++ b/vdsm/storage/sp.py
@@ -646,7 +646,8 @@ class StoragePool:
         dom = SDF.produce(sdUUID)
         dom.acquireClusterLock(self.id)
         try:
-            if dom.getVersion() != self.masterDomain.getVersion():
+            #If you remove this condition, remove it from public_createStoragePool too.
+            if dom.isData() and (dom.getVersion() != self.masterDomain.getVersion()):
                 raise se.MixedSDVersionError(dom.sdUUID, dom.getVersion(),
self.masterDomain.sdUUID, self.masterDomain.getVersion())
             dom.attach(self.spUUID)
             domains[sdUUID] = sd.DOM_ATTACHED_STATUS

[MERGED PATCH] BZ#717225 - Check version consistency only for data SDs. (via gerrit-bot)

Patch merged into repository

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