Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/openstack/cinder/patches/11-zfssa-pep-iscsi.patch
author saurabh.vyas@oracle.com
Tue, 26 Jan 2016 11:13:13 -0800
changeset 5340 d02afa922d41
permissions -rw-r--r--
21241934 ZFSSA driver should return free (vs available) space 22158523 Can't boot zone as iscsi lun has changed
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5340
d02afa922d41 21241934 ZFSSA driver should return free (vs available) space
saurabh.vyas@oracle.com
parents:
diff changeset 
     1
 
--- cinder-2014.2.2/cinder/volume/drivers/zfssa/zfssaiscsi.py.~1~	2015-02-05 08:03:26.000000000 -0800
d02afa922d41 21241934 ZFSSA driver should return free (vs available) space
saurabh.vyas@oracle.com
parents:
diff changeset 
     2
 
+++ cinder-2014.2.2/cinder/volume/drivers/zfssa/zfssaiscsi.py	2015-11-08 21:59:29.027424535 -0800
d02afa922d41 21241934 ZFSSA driver should return free (vs available) space
saurabh.vyas@oracle.com
parents:
diff changeset 
     3
 
@@ -290,7 +290,9 @@
d02afa922d41 21241934 ZFSSA driver should return free (vs available) space
saurabh.vyas@oracle.com
parents:
diff changeset 
     4
 
         data["storage_protocol"] = self.protocol
d02afa922d41 21241934 ZFSSA driver should return free (vs available) space
saurabh.vyas@oracle.com
parents:
diff changeset 
     5
d02afa922d41 21241934 ZFSSA driver should return free (vs available) space
saurabh.vyas@oracle.com
parents:
diff changeset 
     6
 
         lcfg = self.configuration
d02afa922d41 21241934 ZFSSA driver should return free (vs available) space
saurabh.vyas@oracle.com
parents:
diff changeset 
     7
 
-        (avail, total) = self.zfssa.get_pool_stats(lcfg.zfssa_pool)
d02afa922d41 21241934 ZFSSA driver should return free (vs available) space
saurabh.vyas@oracle.com
parents:
diff changeset 
     8
 
+        total = self.zfssa.get_pool_stats(lcfg.zfssa_pool)
d02afa922d41 21241934 ZFSSA driver should return free (vs available) space
saurabh.vyas@oracle.com
parents:
diff changeset 
     9
 
+        avail = self.zfssa.get_project_stats(lcfg.zfssa_pool,
d02afa922d41 21241934 ZFSSA driver should return free (vs available) space
saurabh.vyas@oracle.com
parents:
diff changeset 
    10
 
+                                             lcfg.zfssa_project)
d02afa922d41 21241934 ZFSSA driver should return free (vs available) space
saurabh.vyas@oracle.com
parents:
diff changeset 
    11
 
         if avail is None or total is None:
d02afa922d41 21241934 ZFSSA driver should return free (vs available) space
saurabh.vyas@oracle.com
parents:
diff changeset 
    12
 
             return
d02afa922d41 21241934 ZFSSA driver should return free (vs available) space
saurabh.vyas@oracle.com
parents:
diff changeset 
    13
d02afa922d41 21241934 ZFSSA driver should return free (vs available) space
saurabh.vyas@oracle.com
parents:
diff changeset 
    14
 
@@ -334,9 +336,8 @@
d02afa922d41 21241934 ZFSSA driver should return free (vs available) space
saurabh.vyas@oracle.com
parents:
diff changeset 
    15
 
                                           '')
d02afa922d41 21241934 ZFSSA driver should return free (vs available) space
saurabh.vyas@oracle.com
parents:
diff changeset 
    16
d02afa922d41 21241934 ZFSSA driver should return free (vs available) space
saurabh.vyas@oracle.com
parents:
diff changeset 
    17
 
     def ensure_export(self, context, volume):
d02afa922d41 21241934 ZFSSA driver should return free (vs available) space
saurabh.vyas@oracle.com
parents:
diff changeset 
    18
 
-        """Driver entry point to get the export info for an existing volume."""
d02afa922d41 21241934 ZFSSA driver should return free (vs available) space
saurabh.vyas@oracle.com
parents:
diff changeset 
    19
 
-        LOG.debug('ensure_export: volume name: %s' % volume['name'])
d02afa922d41 21241934 ZFSSA driver should return free (vs available) space
saurabh.vyas@oracle.com
parents:
diff changeset 
    20
 
-        return self._export_volume(volume)
d02afa922d41 21241934 ZFSSA driver should return free (vs available) space
saurabh.vyas@oracle.com
parents:
diff changeset 
    21
 
+        """Synchronously recreates an export for a volume."""
d02afa922d41 21241934 ZFSSA driver should return free (vs available) space
saurabh.vyas@oracle.com
parents:
diff changeset 
    22
 
+        pass
d02afa922d41 21241934 ZFSSA driver should return free (vs available) space
saurabh.vyas@oracle.com
parents:
diff changeset 
    23
d02afa922d41 21241934 ZFSSA driver should return free (vs available) space
saurabh.vyas@oracle.com
parents:
diff changeset 
    24
 
     def copy_image_to_volume(self, context, volume, image_service, image_id):
d02afa922d41 21241934 ZFSSA driver should return free (vs available) space
saurabh.vyas@oracle.com
parents:
diff changeset 
    25
 
         self.ensure_export(context, volume)
upstream/oracle/userland-gate