API: libcrmcommon: Add PCMK_SCHEDULER_INPUT_DIR defined constant.

ClusterLabs · Aug 20, 2024 · 3031286 · 3031286
1 parent 649e3f0
commit 3031286
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 29 deletions.
diff --git a/configure.ac b/configure.ac
@@ -815,10 +815,10 @@ AC_DEFINE_UNQUOTED([CRM_BLACKBOX_DIR], ["$CRM_BLACKBOX_DIR"],
                    [Where to keep blackbox dumps])
 AC_SUBST(CRM_BLACKBOX_DIR)
 
-PE_STATE_DIR="${localstatedir}/lib/pacemaker/pengine"
-AC_DEFINE_UNQUOTED([PE_STATE_DIR], ["$PE_STATE_DIR"],
+PCMK_SCHEDULER_INPUT_DIR="${localstatedir}/lib/pacemaker/pengine"
+AC_DEFINE_UNQUOTED([PCMK_SCHEDULER_INPUT_DIR], ["$PCMK_SCHEDULER_INPUT_DIR"],
                    [Where to keep scheduler outputs])
-AC_SUBST(PE_STATE_DIR)
+AC_SUBST(PCMK_SCHEDULER_INPUT_DIR)
 
 CRM_CONFIG_DIR="${localstatedir}/lib/pacemaker/cib"
 AC_DEFINE_UNQUOTED([CRM_CONFIG_DIR], ["$CRM_CONFIG_DIR"],

diff --git a/daemons/controld/controld_schedulerd.c b/daemons/controld/controld_schedulerd.c
@@ -62,7 +62,7 @@ save_cib_contents(xmlNode *msg, int call_id, int rc, xmlNode *output,
     CRM_CHECK(id != NULL, return);
 
     if (rc == pcmk_ok) {
-        char *filename = crm_strdup_printf(PE_STATE_DIR "/pe-core-%s.bz2", id);
+        char *filename = crm_strdup_printf(PCMK_SCHEDULER_INPUT_DIR "/pe-core-%s.bz2", id);
 
         if (pcmk__xml_write_file(output, filename, true) != pcmk_rc_ok) {
             crm_err("Could not save Cluster Information Base to %s after scheduler crash",
@@ -90,7 +90,7 @@ handle_disconnect(void)
         char *uuid_str = crm_generate_uuid();
 
         crm_crit("Lost connection to the scheduler "
-                 QB_XS " CIB will be saved to " PE_STATE_DIR "/pe-core-%s.bz2",
+                 QB_XS " CIB will be saved to " PCMK_SCHEDULER_INPUT_DIR "/pe-core-%s.bz2",
                  uuid_str);
 
         /*

diff --git a/daemons/controld/pacemaker-controld.c b/daemons/controld/pacemaker-controld.c
@@ -147,11 +147,11 @@ main(int argc, char **argv)
         old_instance = NULL;
     }
 
-    if (pcmk__daemon_can_write(PE_STATE_DIR, NULL) == FALSE) {
+    if (pcmk__daemon_can_write(PCMK_SCHEDULER_INPUT_DIR, NULL) == FALSE) {
         exit_code = CRM_EX_FATAL;
-        crm_err("Terminating due to bad permissions on " PE_STATE_DIR);
+        crm_err("Terminating due to bad permissions on " PCMK_SCHEDULER_INPUT_DIR);
         g_set_error(&error, PCMK__EXITC_ERROR, exit_code,
-                    "Bad permissions on " PE_STATE_DIR
+                    "Bad permissions on " PCMK_SCHEDULER_INPUT_DIR
                     " (see logs for details)");
         goto done;
 

diff --git a/daemons/pacemakerd/pacemakerd.c b/daemons/pacemakerd/pacemakerd.c
@@ -155,7 +155,7 @@ create_pcmk_dirs(void)
         PCMK__PERSISTENT_DATA_DIR,  // core/blackbox/scheduler/CIB files
         CRM_CORE_DIR,               // core files
         CRM_BLACKBOX_DIR,           // blackbox dumps
-        PE_STATE_DIR,               // scheduler inputs
+        PCMK_SCHEDULER_INPUT_DIR,   // scheduler inputs
         CRM_CONFIG_DIR,             // the Cluster Information Base (CIB)
         // Don't build PCMK__OCF_TMP_DIR the executor will do it
         NULL

diff --git a/daemons/schedulerd/Makefile.am b/daemons/schedulerd/Makefile.am
@@ -39,11 +39,11 @@ pacemaker_schedulerd_SOURCES	+= schedulerd_messages.c
 
 .PHONY: install-exec-local
 install-exec-local:
-	$(INSTALL) -d -m 750 $(DESTDIR)/$(PE_STATE_DIR)
-	-chown $(CRM_DAEMON_USER):$(CRM_DAEMON_GROUP) $(DESTDIR)/$(PE_STATE_DIR)
+	$(INSTALL) -d -m 750 $(DESTDIR)/$(PCMK_SCHEDULER_INPUT_DIR)
+	-chown $(CRM_DAEMON_USER):$(CRM_DAEMON_GROUP) $(DESTDIR)/$(PCMK_SCHEDULER_INPUT_DIR)
 
 .PHONY: uninstall-local
 uninstall-local:
-	-rmdir $(DESTDIR)/$(PE_STATE_DIR)
+	-rmdir $(DESTDIR)/$(PCMK_SCHEDULER_INPUT_DIR)
 
 CLEANFILES = $(man7_MANS)
diff --git a/daemons/schedulerd/pacemaker-schedulerd.c b/daemons/schedulerd/pacemaker-schedulerd.c
@@ -138,11 +138,12 @@ main(int argc, char **argv)
     crm_log_init(NULL, LOG_INFO, TRUE, FALSE, argc, argv, FALSE);
     crm_notice("Starting Pacemaker scheduler");
 
-    if (pcmk__daemon_can_write(PE_STATE_DIR, NULL) == FALSE) {
-        crm_err("Terminating due to bad permissions on " PE_STATE_DIR);
+    if (pcmk__daemon_can_write(PCMK_SCHEDULER_INPUT_DIR, NULL) == FALSE) {
+        crm_err("Terminating due to bad permissions on " PCMK_SCHEDULER_INPUT_DIR);
         exit_code = CRM_EX_FATAL;
         g_set_error(&error, PCMK__EXITC_ERROR, exit_code,
-                    "ERROR: Bad permissions on %s (see logs for details)", PE_STATE_DIR);
+                    "ERROR: Bad permissions on %s (see logs for details)",
+                    PCMK_SCHEDULER_INPUT_DIR);
         goto done;
     }
 

diff --git a/daemons/schedulerd/schedulerd_messages.c b/daemons/schedulerd/schedulerd_messages.c
@@ -114,7 +114,7 @@ handle_pecalc_request(pcmk__request_t *request)
         series_wrap = series[series_id].wrap;
     }
 
-    if (pcmk__read_series_sequence(PE_STATE_DIR, series[series_id].name,
+    if (pcmk__read_series_sequence(PCMK_SCHEDULER_INPUT_DIR, series[series_id].name,
                                    &seq) != pcmk_rc_ok) {
         // @TODO maybe handle errors better ...
         seq = 0;
@@ -138,7 +138,7 @@ handle_pecalc_request(pcmk__request_t *request)
 
     } else if (!is_repoke) { // Input changed, save to disk
         free(filename);
-        filename = pcmk__series_filename(PE_STATE_DIR,
+        filename = pcmk__series_filename(PCMK_SCHEDULER_INPUT_DIR,
                                          series[series_id].name, seq, true);
     }
 
@@ -157,7 +157,7 @@ handle_pecalc_request(pcmk__request_t *request)
         crm_xml_add_ll(xml_data, PCMK_XA_EXECUTION_DATE,
                        (long long) execution_date);
         pcmk__xml_write_file(xml_data, filename, true);
-        pcmk__write_series_sequence(PE_STATE_DIR, series[series_id].name,
+        pcmk__write_series_sequence(PCMK_SCHEDULER_INPUT_DIR, series[series_id].name,
                                     ++seq, series_wrap);
     }
 

diff --git a/include/crm_config.h.in b/include/crm_config.h.in
@@ -41,7 +41,7 @@
 #undef CRM_CONFIG_DIR
 
 /* Where to keep scheduler outputs */
-#undef PE_STATE_DIR
+#undef PCMK_SCHEDULER_INPUT_DIR
 
 // NOTE: sbd (as of at least 1.5.2) uses this
 /* Location to store core files produced by Pacemaker daemons */

diff --git a/lib/pacemaker-pe_status.pc.in b/lib/pacemaker-pe_status.pc.in
@@ -2,7 +2,7 @@ sub=pe_status
 libdir=@libdir@
 includedir=@includedir@/@PACKAGE_TARNAME@
 
-penginedir=@PE_STATE_DIR@
+penginedir=@PCMK_SCHEDULER_INPUT_DIR@
 
 Name:             lib${sub}
 URL:              @PACKAGE_URL@

diff --git a/lib/pacemaker.pc.in b/lib/pacemaker.pc.in
@@ -16,7 +16,7 @@ features=@PCMK_FEATURES@
 # Duplicates from other .pc files, since those may eventually go away
 configdir=@CRM_CONFIG_DIR@
 schemadir=@PCMK_SCHEMA_DIR@
-penginedir=@PE_STATE_DIR@
+penginedir=@PCMK_SCHEDULER_INPUT_DIR@
 ocfdir=@OCF_RA_INSTALL_DIR@
 
 Name:             lib${sub}

diff --git a/tools/report.collector.in b/tools/report.collector.in
@@ -1,7 +1,7 @@
 #
 # Originally based on hb_report
 # Copyright 2007 Dejan Muhamedagic <[email protected]>
-# Later changes copyright 2010-2018 the Pacemaker project contributors
+# Later changes copyright 2010-2024 the Pacemaker project contributors
 #
 # The version control history for this file may have further details.
 #
@@ -400,13 +400,13 @@ getbacktraces() {
 }
 
 getpeinputs() {
-    if [ -n "$PE_STATE_DIR" ]; then
+    if [ -n "$PCMK_SCHEDULER_INPUT_DIR" ]; then
         flist=$(
-            find_files "$PE_STATE_DIR" "$1" "$2" | sed "s,`dirname $PE_STATE_DIR`/,,g"
+            find_files "$PCMK_SCHEDULER_INPUT_DIR" "$1" "$2" | sed "s,`dirname $PCMK_SCHEDULER_INPUT_DIR`/,,g"
         )
         if [ "$flist" ]; then
-            (cd $(dirname "$PE_STATE_DIR") && tar cf - $flist) | (cd "$3" && tar xf -)
-            debug "found `echo $flist | wc -w` scheduler input files in $PE_STATE_DIR"
+            (cd $(dirname "$PCMK_SCHEDULER_INPUT_DIR") && tar cf - $flist) | (cd "$3" && tar xf -)
+            debug "found `echo $flist | wc -w` scheduler input files in $PCMK_SCHEDULER_INPUT_DIR"
         fi
     fi
 }
@@ -662,7 +662,7 @@ get_logfiles() {
 
 essential_files() {
 	cat<<EOF
-d $PE_STATE_DIR 0750 hacluster haclient
+d $PCMK_SCHEDULER_INPUT_DIR 0750 hacluster haclient
 d $CRM_CONFIG_DIR 0750 hacluster haclient
 d $CRM_STATE_DIR 0750 hacluster haclient
 EOF

diff --git a/tools/report.common.in b/tools/report.common.in
@@ -1,7 +1,7 @@
 #
 # Originally based on hb_report
 # Copyright 2007 Dejan Muhamedagic <[email protected]>
-# Later changes copyright 2010-2022 the Pacemaker project contributors
+# Later changes copyright 2010-2024 the Pacemaker project contributors
 #
 # The version control history for this file may have further details.
 #
@@ -279,7 +279,7 @@ detect_host() {
     BLACKBOX_DIR=$config_root/blackbox
     debug "Pacemaker blackboxes (if any) located in: $BLACKBOX_DIR"
 
-    PE_STATE_DIR=$(detect_pe_dir "$config_root")
+    PCMK_SCHEDULER_INPUT_DIR=$(detect_pe_dir "$config_root")
 
     CRM_CORE_DIRS=""
     for d in $config_root/cores $local_state_dir/lib/corosync; do