d0733a0f4f
This is an effort to decouple some of the cinder backend specific code (like nfs, scaleio) from the generic logic. The purpose is to make the code modular and any change for a particular cinder backend should not affect the code path of other backends thereby reducing regression. This is also required for another use case of supporting extend of attached volumes added in [1]. Following are the major changes done in this patch: 1) Move cinder store to a new directory 'cinder' and rename 'cinder.py' to 'store.py' (similar to swift) 2) Create new files for nfs and scaleio backends for moving code specific to these backends into their own separate file. This also fixes one bug when using sparse files in nfs and we wait for file size to be equal to volume size (initially done for scaleio/powerflex backend) but this will never happen for nfs sparse files. See bug: 2000584 3) Move cinder tests to 'tests/unit/cinder' directory and add tests for base, nfs and scaleio files. 4) Modify/fix existing tests Closes-Bug: #2000584 [1] https://review.opendev.org/c/openstack/glance_store/+/868742 Depends-On: https://review.opendev.org/c/openstack/glance/+/869021 Change-Id: I26c272b6c503e98fbbafca411d3eec47283bd6fc
80 lines
3.0 KiB
Python
80 lines
3.0 KiB
Python
# Copyright 2023 Red Hat, Inc.
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import logging
|
|
import math
|
|
import os
|
|
import time
|
|
|
|
from oslo_config import cfg
|
|
from oslo_utils import units
|
|
|
|
from glance_store._drivers.cinder import base
|
|
from glance_store import exceptions
|
|
from glance_store.i18n import _
|
|
|
|
CONF = cfg.CONF
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
|
|
class ScaleIOBrickConnector(base.BaseBrickConnectorInterface):
|
|
|
|
@staticmethod
|
|
def _get_device_size(device_file):
|
|
# The seek position is corrected after every extend operation
|
|
# with the bytes written (which is after this wait call) so we
|
|
# don't need to worry about setting it back to original position
|
|
device_file.seek(0, os.SEEK_END)
|
|
# There are other ways to determine the file size like os.stat
|
|
# or os.path.getsize but it requires file name attribute which
|
|
# we don't have for the RBD file wrapper RBDVolumeIOWrapper
|
|
device_size = device_file.tell()
|
|
device_size = int(math.ceil(float(device_size) / units.Gi))
|
|
return device_size
|
|
|
|
@staticmethod
|
|
def _wait_resize_device(volume, device_file):
|
|
timeout = 20
|
|
max_recheck_wait = 10
|
|
tries = 0
|
|
elapsed = 0
|
|
while ScaleIOBrickConnector._get_device_size(
|
|
device_file) < volume.size:
|
|
wait = min(0.5 * 2 ** tries, max_recheck_wait)
|
|
time.sleep(wait)
|
|
tries += 1
|
|
elapsed += wait
|
|
if elapsed >= timeout:
|
|
msg = (_('Timeout while waiting while volume %(volume_id)s '
|
|
'to resize the device in %(tries)s tries.')
|
|
% {'volume_id': volume.id, 'tries': tries})
|
|
LOG.error(msg)
|
|
raise exceptions.BackendException(msg)
|
|
|
|
def yield_path(self, volume, volume_path):
|
|
"""
|
|
This method waits for the LUN size to match the volume size.
|
|
|
|
This method is created to fix Bug#2000584 where NFS sparse volumes
|
|
timeout waiting for the file size to match the volume.size field.
|
|
The reason is that the volume is sparse and only takes up space of
|
|
data which is written to it (similar to thin provisioned volumes).
|
|
"""
|
|
# Sometimes the extended LUN on storage side takes time
|
|
# to reflect in the device so we wait until the device
|
|
# size is equal to the extended volume size.
|
|
ScaleIOBrickConnector._wait_resize_device(volume, volume_path)
|
|
return volume_path
|