From 1cf87254e8c6e05824282bfb44024d8072d5b301 Mon Sep 17 00:00:00 2001
From: Stephen Taylor <stephen.taylor.1@att.com>
Date: Wed, 29 Mar 2023 14:58:40 -0600
Subject: [PATCH] [ceph-client] Allow pg_num_min to be overridden per pool

This change allows the target pg_num_min value (global for all
pools) to be overridden on a per-pool basis by specifying a
pg_num_min value in an individual pool's values. A global value for
all pools may not suffice in all cases.

Change-Id: I42c55606d48975b40bbab9501289a7a59c15683f
---
 ceph-client/Chart.yaml                      |  2 +-
 ceph-client/templates/bin/pool/_init.sh.tpl | 16 +++++++++++-----
 ceph-client/values.yaml                     |  2 ++
 releasenotes/notes/ceph-client.yaml         |  1 +
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ceph-client/Chart.yaml b/ceph-client/Chart.yaml
index 5856f404d..b79bfe860 100644
--- a/ceph-client/Chart.yaml
+++ b/ceph-client/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph Client
 name: ceph-client
-version: 0.1.43
+version: 0.1.44
 home: https://github.com/ceph/ceph-client
 ...
diff --git a/ceph-client/templates/bin/pool/_init.sh.tpl b/ceph-client/templates/bin/pool/_init.sh.tpl
index a922a0ad1..3babe9297 100644
--- a/ceph-client/templates/bin/pool/_init.sh.tpl
+++ b/ceph-client/templates/bin/pool/_init.sh.tpl
@@ -238,7 +238,7 @@ function create_pool () {
   POOL_PLACEMENT_GROUPS=$4
   POOL_CRUSH_RULE=$5
   POOL_PROTECTION=$6
-  PG_NUM_MIN={{.Values.conf.pool.target.pg_num_min}}
+  PG_NUM_MIN=$7
   if ! ceph --cluster "${CLUSTER}" osd pool stats "${POOL_NAME}" > /dev/null 2>&1; then
     if [[ ${POOL_PLACEMENT_GROUPS} -gt 0 ]]; then
       ceph --cluster "${CLUSTER}" osd pool create "${POOL_NAME}" ${POOL_PLACEMENT_GROUPS}
@@ -327,6 +327,7 @@ function manage_pool () {
   POOL_QUOTA=$7
   POOL_PROTECTION=$8
   CLUSTER_CAPACITY=$9
+  POOL_PG_NUM_MIN=${10}
   TOTAL_OSDS={{.Values.conf.pool.target.osd}}
   POOL_PLACEMENT_GROUPS=0
   if [[ -n "${TOTAL_DATA_PERCENT}" ]]; then
@@ -334,7 +335,7 @@ function manage_pool () {
       POOL_PLACEMENT_GROUPS=$(python3 /tmp/pool-calc.py ${POOL_REPLICATION} ${TOTAL_OSDS} ${TOTAL_DATA_PERCENT} ${TARGET_PG_PER_OSD})
     fi
   fi
-  create_pool "${POOL_APPLICATION}" "${POOL_NAME}" "${POOL_REPLICATION}" "${POOL_PLACEMENT_GROUPS}" "${POOL_CRUSH_RULE}" "${POOL_PROTECTION}"
+  create_pool "${POOL_APPLICATION}" "${POOL_NAME}" "${POOL_REPLICATION}" "${POOL_PLACEMENT_GROUPS}" "${POOL_CRUSH_RULE}" "${POOL_PROTECTION}" "${POOL_PG_NUM_MIN}"
   ceph --cluster "${CLUSTER}" osd pool set-quota "${POOL_NAME}" max_bytes $POOL_QUOTA
 }
 
@@ -363,6 +364,7 @@ reweight_osds
 {{ $crushRuleDefault := .Values.conf.pool.default.crush_rule }}
 {{ $targetQuota := .Values.conf.pool.target.quota | default 100 }}
 {{ $targetProtection := .Values.conf.pool.target.protected | default "false" | quote | lower }}
+{{ $targetPGNumMin := .Values.conf.pool.target.pg_num_min }}
 cluster_capacity=$(ceph --cluster "${CLUSTER}" df -f json-pretty | grep '"total_bytes":' | head -n1 | awk '{print $2}' | tr -d ',')
 
 # Check to make sure pool quotas don't exceed the expected cluster capacity in its final state
@@ -402,11 +404,15 @@ fi
 # Read the pool quota from the pool spec (no quota if absent)
 # Set pool_quota to 0 if target_quota is 0
 [[ ${target_quota} -eq 0 ]] && pool_quota=0 || pool_quota="$(convert_to_bytes {{ .pool_quota | default 0 }})"
+pool_crush_rule="{{ $crushRuleDefault }}"
 {{- if .crush_rule }}
-manage_pool {{ .application }} ${pool_name} {{ .replication }} {{ .percent_total_data }} {{ $targetPGperOSD }} {{ .crush_rule }} $pool_quota {{ $targetProtection }} ${cluster_capacity} &
-{{ else }}
-manage_pool {{ .application }} ${pool_name} {{ .replication }} {{ .percent_total_data }} {{ $targetPGperOSD }} {{ $crushRuleDefault }} $pool_quota {{ $targetProtection }} ${cluster_capacity} &
+pool_crush_rule="{{ .crush_rule }}"
 {{- end }}
+pool_pg_num_min={{ $targetPGNumMin }}
+{{- if .pg_num_min }}
+pool_pg_num_min={{ .pg_num_min }}
+{{- end }}
+manage_pool {{ .application }} ${pool_name} {{ .replication }} {{ .percent_total_data }} {{ $targetPGperOSD }} $pool_crush_rule $pool_quota {{ $targetProtection }} ${cluster_capacity} ${pool_pg_num_min} &
 MANAGE_POOL_PID=$!
 MANAGE_POOL_PIDS+=( $MANAGE_POOL_PID )
 {{- if .rename }}
diff --git a/ceph-client/values.yaml b/ceph-client/values.yaml
index 28982bcb1..2ca051f65 100644
--- a/ceph-client/values.yaml
+++ b/ceph-client/values.yaml
@@ -344,6 +344,8 @@ conf:
         # May be specified in TiB, TB, GiB, GB, MiB, MB, KiB, KB, or bytes
         # NOTE: This should always be a string value to avoid Helm issues with large integers
         # pool_quota: "100GiB"
+        # Example of an overridden pg_num_min value for a single pool
+        # pg_num_min: 32
       # NOTE(supamatt): By default the crush rules used to create each pool will be
       # taken from the pool default `crush_rule` unless a pool specific `crush_rule`
       # is specified. The rule MUST exist for it to be defined here.
diff --git a/releasenotes/notes/ceph-client.yaml b/releasenotes/notes/ceph-client.yaml
index 7a4615b9f..46bff0dd7 100644
--- a/releasenotes/notes/ceph-client.yaml
+++ b/releasenotes/notes/ceph-client.yaml
@@ -44,4 +44,5 @@ ceph-client:
   - 0.1.41 Allow gate scripts to use 1x replication in Ceph
   - 0.1.42 Update all Ceph images to Focal
   - 0 1.43 Document the use of mon_allow_pool_size_one
+  - 0.1.44 Allow pg_num_min to be overridden per pool
 ...