1 --- cinder-2014.2.2/cinder/volume/drivers/zfssa/zfssaiscsi.py.~1~	2015-02-05 08:03:26.000000000 -0800

     2 +++ cinder-2014.2.2/cinder/volume/drivers/zfssa/zfssaiscsi.py	2015-11-08 21:59:29.027424535 -0800

     3 @@ -290,7 +290,9 @@

     4          data["storage_protocol"] = self.protocol

     5  

     6          lcfg = self.configuration

     7 -        (avail, total) = self.zfssa.get_pool_stats(lcfg.zfssa_pool)

     8 +        total = self.zfssa.get_pool_stats(lcfg.zfssa_pool)

     9 +        avail = self.zfssa.get_project_stats(lcfg.zfssa_pool,

    10 +                                             lcfg.zfssa_project)

    11          if avail is None or total is None:

    12              return

    13  

    14 @@ -334,9 +336,8 @@

    15                                            '')

    16  

    17      def ensure_export(self, context, volume):

    18 -        """Driver entry point to get the export info for an existing volume."""

    19 -        LOG.debug('ensure_export: volume name: %s' % volume['name'])

    20 -        return self._export_volume(volume)

    21 +        """Synchronously recreates an export for a volume."""

    22 +        pass

    23  

    24      def copy_image_to_volume(self, context, volume, image_service, image_id):

    25          self.ensure_export(context, volume)