blob: 6fe2319593758585acfc8f8e91ca065e5da871e2 [file] [log] [blame]
Peter Pentchevd6934752024-01-18 13:01:54 +02001From 7daed00eb1208ed62a9bd7f8432ed6d48b2efb01 Mon Sep 17 00:00:00 2001
Peter Pentchev6ef0f072022-09-26 16:20:30 +03002From: Peter Penchev <openstack-dev@storpool.com>
3Date: Mon, 26 Sep 2022 16:04:36 +0300
Peter Pentchevd6934752024-01-18 13:01:54 +02004Subject: [PATCH 3/9] StorPool: drop copy_image_to_volume() and
Peter Pentchev6ef0f072022-09-26 16:20:30 +03005 copy_volume_to_image()
6
7These methods seem to be leftovers from a bygone era when the parent
8driver could not or would not attach volumes safely.
9
10Change-Id: I6e1a9026e677aee6c7ccad908fe6f92dc253762a
Peter Pentchevacaaa382023-02-28 11:26:13 +020011Closes-Bug: #2002996
Peter Pentchev6ef0f072022-09-26 16:20:30 +030012---
Peter Pentchevd6934752024-01-18 13:01:54 +020013 cinder/volume/drivers/storpool.py | 45 -------------------------------
14 1 file changed, 45 deletions(-)
Peter Pentchev6ef0f072022-09-26 16:20:30 +030015
16diff --git a/cinder/volume/drivers/storpool.py b/cinder/volume/drivers/storpool.py
Peter Pentchevd6934752024-01-18 13:01:54 +020017index c595c1c0c..37e36fd61 100644
Peter Pentchev6ef0f072022-09-26 16:20:30 +030018--- a/cinder/volume/drivers/storpool.py
19+++ b/cinder/volume/drivers/storpool.py
Peter Pentchevd6934752024-01-18 13:01:54 +020020@@ -315,51 +315,6 @@ class StorPoolDriver(driver.VolumeDriver):
Peter Pentchev6ef0f072022-09-26 16:20:30 +030021 'pools': pools
22 }
23
24- def copy_volume_to_image(self, context, volume, image_service, image_meta):
25- req_id = context.request_id
26- volname = self._attach.volumeName(volume['id'])
27- name = self._attach.volsnapName(volume['id'], req_id)
28- try:
29- self._attach.api().snapshotCreate(volname, {'name': name})
30- except spapi.ApiError as e:
31- raise self._backendException(e)
32- self._attach.add(req_id, {
33- 'volume': name,
34- 'type': 'copy-from',
35- 'id': req_id,
36- 'rights': 1,
37- 'volsnap': True
38- })
39- try:
40- return super(StorPoolDriver, self).copy_volume_to_image(
41- context, volume, image_service, image_meta)
42- finally:
43- self._attach.remove(req_id)
44- try:
45- self._attach.api().snapshotDelete(name)
46- except spapi.ApiError as e:
47- LOG.error(
48- 'Could not remove the temp snapshot %(name)s for '
49- '%(vol)s: %(err)s',
50- {'name': name, 'vol': volname, 'err': e})
51-
Peter Pentchevd6934752024-01-18 13:01:54 +020052- def copy_image_to_volume(self, context, volume, image_service, image_id,
53- disable_sparse=False):
Peter Pentchev6ef0f072022-09-26 16:20:30 +030054- req_id = context.request_id
55- name = self._attach.volumeName(volume['id'])
56- self._attach.add(req_id, {
57- 'volume': name,
58- 'type': 'copy-to',
59- 'id': req_id,
60- 'rights': 2
61- })
62- try:
63- return super(StorPoolDriver, self).copy_image_to_volume(
Peter Pentchevd6934752024-01-18 13:01:54 +020064- context, volume, image_service, image_id,
65- disable_sparse=disable_sparse)
Peter Pentchev6ef0f072022-09-26 16:20:30 +030066- finally:
67- self._attach.remove(req_id)
68-
69 def extend_volume(self, volume, new_size):
70 size = int(new_size) * units.Gi
71 name = self._attach.volumeName(volume['id'])
72--
Peter Pentchevd6934752024-01-18 13:01:54 +0200732.43.0
Peter Pentchev6ef0f072022-09-26 16:20:30 +030074