Configurable timeouts for disk preparing
Supported configurable timeouts for mounting and formatting. Also injected reasons of mounting failure inside log warning. Change-Id: Ieca0d3584726d15681376db1cc2af2114a7bc73a Partial-bug: 1493548 Closes-bug: 1498449
This commit is contained in:
parent
217c4029ac
commit
8cb902da26
@ -213,6 +213,13 @@ class ValidationError(object):
|
|||||||
|
|
||||||
# COMMON FOR ALL PLUGINS CONFIGS
|
# COMMON FOR ALL PLUGINS CONFIGS
|
||||||
|
|
||||||
|
DISKS_PREPARING_TIMEOUT = Config(
|
||||||
|
"Timeout for disk preparing", 'general', 'cluster', priority=1,
|
||||||
|
default_value=300, config_type="int", is_optional=True,
|
||||||
|
description='Timeout for preparing disks, formatting and mounting'
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
NTP_URL = Config(
|
NTP_URL = Config(
|
||||||
"URL of NTP server", 'general', 'cluster', priority=1,
|
"URL of NTP server", 'general', 'cluster', priority=1,
|
||||||
default_value='', is_optional=True,
|
default_value='', is_optional=True,
|
||||||
@ -234,4 +241,5 @@ HEAT_WAIT_CONDITION_TIMEOUT = Config(
|
|||||||
|
|
||||||
|
|
||||||
def list_of_common_configs():
|
def list_of_common_configs():
|
||||||
return [NTP_ENABLED, NTP_URL, HEAT_WAIT_CONDITION_TIMEOUT]
|
return [DISKS_PREPARING_TIMEOUT, NTP_ENABLED, NTP_URL,
|
||||||
|
HEAT_WAIT_CONDITION_TIMEOUT]
|
||||||
|
@ -25,6 +25,7 @@ from sahara import exceptions as ex
|
|||||||
from sahara.i18n import _
|
from sahara.i18n import _
|
||||||
from sahara.i18n import _LE
|
from sahara.i18n import _LE
|
||||||
from sahara.i18n import _LW
|
from sahara.i18n import _LW
|
||||||
|
from sahara.plugins import provisioning as plugin_base
|
||||||
from sahara.utils import cluster_progress_ops as cpo
|
from sahara.utils import cluster_progress_ops as cpo
|
||||||
from sahara.utils.openstack import base as b
|
from sahara.utils.openstack import base as b
|
||||||
from sahara.utils.openstack import cinder
|
from sahara.utils.openstack import cinder
|
||||||
@ -40,6 +41,16 @@ CONF.import_opt('api_version', 'sahara.utils.openstack.cinder',
|
|||||||
group='cinder')
|
group='cinder')
|
||||||
|
|
||||||
|
|
||||||
|
def _get_timeout_for_disk_preparing(cluster):
|
||||||
|
configs = cluster.cluster_configs.to_dict()
|
||||||
|
option_name = plugin_base.DISKS_PREPARING_TIMEOUT.name
|
||||||
|
option_target = plugin_base.DISKS_PREPARING_TIMEOUT.applicable_target
|
||||||
|
try:
|
||||||
|
return int(configs[option_target][option_name])
|
||||||
|
except Exception:
|
||||||
|
return int(plugin_base.DISKS_PREPARING_TIMEOUT.default_value)
|
||||||
|
|
||||||
|
|
||||||
def _count_instances_to_attach(instances):
|
def _count_instances_to_attach(instances):
|
||||||
result = 0
|
result = 0
|
||||||
for instance in instances:
|
for instance in instances:
|
||||||
@ -210,24 +221,31 @@ def _mount_volume_to_node(instance, index, device):
|
|||||||
def _format_device(instance, device, formatted_devices=None, lock=None):
|
def _format_device(instance, device, formatted_devices=None, lock=None):
|
||||||
with instance.remote() as r:
|
with instance.remote() as r:
|
||||||
try:
|
try:
|
||||||
|
timeout = _get_timeout_for_disk_preparing(instance.cluster)
|
||||||
|
|
||||||
# Format devices with better performance options:
|
# Format devices with better performance options:
|
||||||
# - reduce number of blocks reserved for root to 1%
|
# - reduce number of blocks reserved for root to 1%
|
||||||
# - use 'dir_index' for faster directory listings
|
# - use 'dir_index' for faster directory listings
|
||||||
# - use 'extents' to work faster with large files
|
# - use 'extents' to work faster with large files
|
||||||
# - disable journaling
|
# - disable journaling
|
||||||
|
|
||||||
fs_opts = '-F -m 1 -O dir_index,extents,^has_journal'
|
fs_opts = '-F -m 1 -O dir_index,extents,^has_journal'
|
||||||
r.execute_command('sudo mkfs.ext4 %s %s' % (fs_opts, device))
|
r.execute_command('sudo mkfs.ext4 %s %s' % (fs_opts, device),
|
||||||
|
timeout=timeout)
|
||||||
if lock:
|
if lock:
|
||||||
with lock:
|
with lock:
|
||||||
formatted_devices.append(device)
|
formatted_devices.append(device)
|
||||||
except Exception:
|
except Exception as e:
|
||||||
LOG.warning(
|
LOG.warning(
|
||||||
_LW("Device {dev} cannot be formatted").format(dev=device))
|
_LW("Device {dev} cannot be formatted: {reason}").format(
|
||||||
|
dev=device, reason=e))
|
||||||
|
|
||||||
|
|
||||||
def _mount_volume(instance, device_path, mount_point):
|
def _mount_volume(instance, device_path, mount_point):
|
||||||
with instance.remote() as r:
|
with instance.remote() as r:
|
||||||
try:
|
try:
|
||||||
|
timeout = _get_timeout_for_disk_preparing(instance.cluster)
|
||||||
|
|
||||||
# Mount volumes with better performance options:
|
# Mount volumes with better performance options:
|
||||||
# - enable write-back
|
# - enable write-back
|
||||||
# - do not store access time
|
# - do not store access time
|
||||||
@ -235,7 +253,8 @@ def _mount_volume(instance, device_path, mount_point):
|
|||||||
|
|
||||||
r.execute_command('sudo mkdir -p %s' % mount_point)
|
r.execute_command('sudo mkdir -p %s' % mount_point)
|
||||||
r.execute_command('sudo mount %s %s %s' %
|
r.execute_command('sudo mount %s %s %s' %
|
||||||
(mount_opts, device_path, mount_point))
|
(mount_opts, device_path, mount_point),
|
||||||
|
timeout=timeout)
|
||||||
r.execute_command(
|
r.execute_command(
|
||||||
'sudo sh -c "grep %s /etc/mtab >> /etc/fstab"' % device_path)
|
'sudo sh -c "grep %s /etc/mtab >> /etc/fstab"' % device_path)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user