From 3b0d3cac44823b52dab547a14bdaa00948665206 Mon Sep 17 00:00:00 2001
From: Stephen Taylor <stephen.taylor.1@att.com>
Date: Sat, 2 Apr 2022 08:54:26 -0600
Subject: [PATCH] [ceph-osd] Skip pod wait in post-apply job when disruptive

The new, disruptive post-apply logic to restart ceph-osd pods more
efficiently on upgrade still waits for pods to be in a non-
disruptive state before restarting them disruptively. This change
skips that wait if a disruptive restart is in progress.

Change-Id: I484a3b899c61066aab6be43c4077fff2db6f54bc
---
 ceph-osd/Chart.yaml                       | 2 +-
 ceph-osd/templates/bin/_post-apply.sh.tpl | 4 +++-
 releasenotes/notes/ceph-osd.yaml          | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ceph-osd/Chart.yaml b/ceph-osd/Chart.yaml
index b6c55d547..e50427f68 100644
--- a/ceph-osd/Chart.yaml
+++ b/ceph-osd/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph OSD
 name: ceph-osd
-version: 0.1.37
+version: 0.1.38
 home: https://github.com/ceph/ceph
 ...
diff --git a/ceph-osd/templates/bin/_post-apply.sh.tpl b/ceph-osd/templates/bin/_post-apply.sh.tpl
index fcf43a985..c8a50202d 100644
--- a/ceph-osd/templates/bin/_post-apply.sh.tpl
+++ b/ceph-osd/templates/bin/_post-apply.sh.tpl
@@ -166,7 +166,9 @@ function restart_by_rack() {
   done
 }
 
-wait_for_pods $CEPH_NAMESPACE
+if [[ "$DISRUPTIVE_OSD_RESTART" != "true" ]]; then
+  wait_for_pods $CEPH_NAMESPACE
+fi
 
 require_upgrade=0
 max_release=0
diff --git a/releasenotes/notes/ceph-osd.yaml b/releasenotes/notes/ceph-osd.yaml
index 33b33b4f2..dd319eafb 100644
--- a/releasenotes/notes/ceph-osd.yaml
+++ b/releasenotes/notes/ceph-osd.yaml
@@ -38,4 +38,5 @@ ceph-osd:
   - 0.1.35 Consolidate mon_endpoints discovery
   - 0.1.36 Add OSD device location pre-check
   - 0.1.37 Add a disruptive OSD restart to the post-apply job
+  - 0.1.38 Skip pod wait in post-apply job when disruptive
 ...