From 4f1dde2c9d14692100727b3e6114da2dd53cad95 Mon Sep 17 00:00:00 2001 From: Ovidiu Poncea Date: Thu, 27 Jun 2019 14:12:00 +0300 Subject: [PATCH] AIO-SX: Fix adding OSD at runtime hanging when /dev/rbd* are mounted This mostly happens when stx-openstack application is running as there are a couple of pods that uses RBD PVCs. The reason of the hang is that, on AIO-SX, all OSDs are stopped while new ones are configured. This leads to data on the /dev/rbd* to be inaccessible when runtime puppet manifests executes 'ceph-disk list' to query the state of all storage devices in the system. This commit removes the code that stops existing OSDs on all deployments. A side effect is a decrease in time needed to add the OSDs on a node with many OSDs already configured. For e.g. time for adding an OSD on a system with 7 OSDs can take more that 2 minutes, while with this change it drops to around 30 seconds. Change-Id: I41a65d42a45a90b00f65509f4e536eb1c345a91b Closes-Bug: 1829855 Signed-off-by: Ovidiu Poncea --- puppet-manifests/src/modules/platform/manifests/ceph.pp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/puppet-manifests/src/modules/platform/manifests/ceph.pp b/puppet-manifests/src/modules/platform/manifests/ceph.pp index f98f438b4d..256e3f24c0 100644 --- a/puppet-manifests/src/modules/platform/manifests/ceph.pp +++ b/puppet-manifests/src/modules/platform/manifests/ceph.pp @@ -563,9 +563,6 @@ class platform::ceph::runtime_osds { exec { 'sm-unmanage service ceph-osd': command => 'sm-unmanage service ceph-osd' } - -> exec { 'stop Ceph OSDs': - command => '/etc/init.d/ceph-init-wrapper stop osd' - } -> Class['::platform::ceph::osds'] -> exec { 'start Ceph OSDs': command => '/etc/init.d/ceph-init-wrapper start osd' @@ -577,9 +574,6 @@ class platform::ceph::runtime_osds { exec { 'remove /etc/pmon.d/ceph.conf': command => 'rm -f /etc/pmon.d/ceph.conf' } - -> exec { 'stop Ceph OSDs': - command => '/etc/init.d/ceph-init-wrapper stop osd' - } -> Class['::platform::ceph::osds'] -> exec { 'start Ceph OSDs': command => '/etc/init.d/ceph-init-wrapper start osd'