| Peter Pentchev | d0130fb | 2021-11-30 10:50:05 +0200 | [diff] [blame] | 1 | From 416b774246fd1c1334bf2e46bbdc6fc644dda4d7 Mon Sep 17 00:00:00 2001 |
| 2 | From: Peter Penchev <openstack-dev@storpool.com> |
| 3 | Date: Mon, 11 May 2020 11:02:53 +0300 |
| 4 | Subject: [PATCH 1/2] StorPool driver: remove the obsolete backup_volume(). |
| 5 | |
| 6 | Follow suit with I984de3df803f12dbb95e3309e668b3fbd519e70f. |
| 7 | |
| 8 | Change-Id: Ia172452fd7c96dccfe54789d868fcf7b748322a3 |
| 9 | --- |
| 10 | cinder/volume/drivers/storpool.py | 29 ----------------------------- |
| 11 | 1 file changed, 29 deletions(-) |
| 12 | |
| 13 | diff --git a/cinder/volume/drivers/storpool.py b/cinder/volume/drivers/storpool.py |
| 14 | index a1388677b..0d2903684 100644 |
| 15 | --- a/cinder/volume/drivers/storpool.py |
| 16 | +++ b/cinder/volume/drivers/storpool.py |
| 17 | @@ -315,35 +315,6 @@ class StorPoolDriver(driver.VolumeDriver): |
| 18 | 'pools': pools |
| 19 | } |
| 20 | |
| 21 | - def backup_volume(self, context, backup, backup_service): |
| 22 | - volume = self.db.volume_get(context, backup['volume_id']) |
| 23 | - req_id = context.request_id |
| 24 | - volname = self._attach.volumeName(volume['id']) |
| 25 | - name = self._attach.volsnapName(volume['id'], req_id) |
| 26 | - try: |
| 27 | - self._attach.api().snapshotCreate(volname, {'name': name}) |
| 28 | - except spapi.ApiError as e: |
| 29 | - raise self._backendException(e) |
| 30 | - self._attach.add(req_id, { |
| 31 | - 'volume': name, |
| 32 | - 'type': 'backup', |
| 33 | - 'id': req_id, |
| 34 | - 'rights': 1, |
| 35 | - 'volsnap': True |
| 36 | - }) |
| 37 | - try: |
| 38 | - return super(StorPoolDriver, self).backup_volume( |
| 39 | - context, backup, backup_service) |
| 40 | - finally: |
| 41 | - self._attach.remove(req_id) |
| 42 | - try: |
| 43 | - self._attach.api().snapshotDelete(name) |
| 44 | - except spapi.ApiError as e: |
| 45 | - LOG.error( |
| 46 | - 'Could not remove the temp snapshot %(name)s for ' |
| 47 | - '%(vol)s: %(err)s', |
| 48 | - {'name': name, 'vol': volname, 'err': e}) |
| 49 | - |
| 50 | def copy_volume_to_image(self, context, volume, image_service, image_meta): |
| 51 | req_id = context.request_id |
| 52 | volname = self._attach.volumeName(volume['id']) |
| 53 | -- |
| 54 | 2.33.0 |
| 55 | |