fix TMPFILE reference

vexxhost · Apr 2, 2024 · 0bc240b · 0bc240b
1 parent 061961e
commit 0bc240b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/roles/osd/tasks/main.yml b/roles/osd/tasks/main.yml
@@ -128,6 +128,7 @@
     - inventory_hostname == groups[ceph_osd_osds_group] | last
 
 - name: Make sure `/var/lib/cron` directory exists
+  when: ceph_bluestore_frag_collect
   ansible.builtin.file:
     path: /var/lib/cron
     state: directory
@@ -154,6 +155,7 @@
 - name: Setup Cron job collect Bluestore fragmentation score for Prometheus
   when: ceph_bluestore_frag_collect
   ansible.builtin.cron:
-    name: "collect bluestore fragmentation score"
+    name: "Collect bluestore fragmentation score"
+    user: root
     minute: "1"
     job: "/var/lib/cron/prom-bs-frag-score-collector.sh"
diff --git a/roles/osd/templates/prom-bs-frag-score-collector.sh.j2 b/roles/osd/templates/prom-bs-frag-score-collector.sh.j2
@@ -3,13 +3,13 @@
 
 export TMPFILE=/tmp/bluestore_allocator_score_block.prom.$$
 osd_path=$(find /var/lib/ceph/{{ ceph_mon_fsid }}/ -type d -name "osd.*"|  head -n 1)
-if [ -z $osd_path ]; then
+if [ ! -z $osd_path ]; then
     cephadm --image "{{ cephadm_image }}" shell --fsid "{{ ceph_mon_fsid }}" \
       --config "$osd_path/config" \
-      -m /var/lib/cron/bs-frag-score.sh -- ./mnt/bs-frag-score.sh > TMPFILE
+      -m /var/lib/cron/bs-frag-score.sh -- ./mnt/bs-frag-score.sh > $TMPFILE
 else
     cephadm --image "{{ cephadm_image }}" shell --fsid "{{ ceph_mon_fsid }}" \
-      -m /var/lib/cron/bs-frag-score.sh -- ./mnt/bs-frag-score.sh > TMPFILE
+      -m /var/lib/cron/bs-frag-score.sh -- ./mnt/bs-frag-score.sh > $TMPFILE
 fi
 
 mv $TMPFILE /tmp/bluestore_allocator_score_block.prom