blob: 1f6e52ce9f9aebfac7c47cfd4072aa465c6bf3fe [file] [log] [blame]
Peter Pentchev7d659682022-06-23 14:20:39 +03001From 7244e7f90e414a5853959877722f8b35461f5549 Mon Sep 17 00:00:00 2001
Peter Pentchevd0130fb2021-11-30 10:50:05 +02002From: Peter Penchev <openstack-dev@storpool.com>
3Date: Mon, 11 May 2020 11:02:53 +0300
Peter Pentchev7d659682022-06-23 14:20:39 +03004Subject: [PATCH 5/8] StorPool driver: remove the obsolete backup_volume()
Peter Pentchevd0130fb2021-11-30 10:50:05 +02005
6Follow suit with I984de3df803f12dbb95e3309e668b3fbd519e70f.
7
8Change-Id: Ia172452fd7c96dccfe54789d868fcf7b748322a3
9---
Peter Pentchev7d659682022-06-23 14:20:39 +030010 cinder/volume/drivers/storpool.py | 30 +-----------------------------
11 1 file changed, 1 insertion(+), 29 deletions(-)
Peter Pentchevd0130fb2021-11-30 10:50:05 +020012
13diff --git a/cinder/volume/drivers/storpool.py b/cinder/volume/drivers/storpool.py
Peter Pentchev7d659682022-06-23 14:20:39 +030014index 56b4070bc..d76957c88 100644
Peter Pentchevd0130fb2021-11-30 10:50:05 +020015--- a/cinder/volume/drivers/storpool.py
16+++ b/cinder/volume/drivers/storpool.py
Peter Pentchev7d659682022-06-23 14:20:39 +030017@@ -95,6 +95,7 @@ class StorPoolDriver(driver.VolumeDriver):
18 connector will handle this.
19 - Detach temporary snapshots and volumes after copying data
20 to or from from Glance images.
21+ - Drop backup_volume()
22 """
23
24 VERSION = '2.0.0'
25@@ -318,35 +319,6 @@ class StorPoolDriver(driver.VolumeDriver):
Peter Pentchevd0130fb2021-11-30 10:50:05 +020026 'pools': pools
27 }
28
29- def backup_volume(self, context, backup, backup_service):
30- volume = self.db.volume_get(context, backup['volume_id'])
31- req_id = context.request_id
32- volname = self._attach.volumeName(volume['id'])
33- name = self._attach.volsnapName(volume['id'], req_id)
34- try:
35- self._attach.api().snapshotCreate(volname, {'name': name})
36- except spapi.ApiError as e:
37- raise self._backendException(e)
38- self._attach.add(req_id, {
39- 'volume': name,
40- 'type': 'backup',
41- 'id': req_id,
42- 'rights': 1,
43- 'volsnap': True
44- })
45- try:
46- return super(StorPoolDriver, self).backup_volume(
47- context, backup, backup_service)
48- finally:
49- self._attach.remove(req_id)
50- try:
51- self._attach.api().snapshotDelete(name)
52- except spapi.ApiError as e:
53- LOG.error(
54- 'Could not remove the temp snapshot %(name)s for '
55- '%(vol)s: %(err)s',
56- {'name': name, 'vol': volname, 'err': e})
57-
58 def copy_volume_to_image(self, context, volume, image_service, image_meta):
59 req_id = context.request_id
60 volname = self._attach.volumeName(volume['id'])
61--
Peter Pentchev7d659682022-06-23 14:20:39 +0300622.35.1
Peter Pentchevd0130fb2021-11-30 10:50:05 +020063