Merging upstream version 2.1.7.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 15 insertions, 12 deletions

diff --git a/daemons/pacemakerd/pcmkd_subdaemons.c b/daemons/pacemakerd/pcmkd_subdaemons.c
index 3b08ecc..21e432e 100644
--- a/daemons/pacemakerd/pcmkd_subdaemons.c
+++ b/daemons/pacemakerd/pcmkd_subdaemons.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2022 the Pacemaker project contributors
+ * Copyright 2010-2023 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
@@ -307,7 +307,7 @@ pcmk_process_exit(pcmk_child_t * child)
     } else if (!child->respawn) {
         /* nothing to do */
 
-    } else if (crm_is_true(getenv("PCMK_fail_fast"))) {
+    } else if (crm_is_true(pcmk__env_option(PCMK__ENV_FAIL_FAST))) {
         crm_err("Rebooting system because of %s", child->name);
         pcmk__panic(__func__);
 
@@ -353,8 +353,8 @@ pcmk_shutdown_worker(gpointer user_data)
                              " if it vitally depends on some other daemons"
                              " going down in a controlled way already,"
                              " or locate and kill the correct %s process"
-                             " on your own; set PCMK_fail_fast=1 to avoid"
-                             " this altogether next time around",
+                             " on your own; set PCMK_" PCMK__ENV_FAIL_FAST "=1"
+                             " to avoid this altogether next time around",
                              child->name, (long) SHUTDOWN_ESCALATION_PERIOD,
                              child->command);
                 }
@@ -389,6 +389,7 @@ pcmk_shutdown_worker(gpointer user_data)
         return TRUE;
     }
 
+    // @COMPAT Drop shutdown delay at 3.0.0
     {
         const char *delay = pcmk__env_option(PCMK__ENV_SHUTDOWN_DELAY);
         if(delay) {
@@ -423,8 +424,8 @@ start_child(pcmk_child_t * child)
     gid_t gid = 0;
     gboolean use_valgrind = FALSE;
     gboolean use_callgrind = FALSE;
-    const char *env_valgrind = getenv("PCMK_valgrind_enabled");
-    const char *env_callgrind = getenv("PCMK_callgrind_enabled");
+    const char *env_valgrind = pcmk__env_option(PCMK__ENV_VALGRIND_ENABLED);
+    const char *env_callgrind = pcmk__env_option(PCMK__ENV_CALLGRIND_ENABLED);
 
     child->active_before_startup = false;
     child->check_count = 0;
@@ -712,14 +713,16 @@ find_and_track_existing_processes(void)
                 continue;
             }
 
+            // @TODO Functionize more of this to reduce nesting
             pcmk_children[i].respawn_count = rounds;
             switch (rc) {
                 case pcmk_rc_ok:
                     if (pcmk_children[i].pid == PCMK__SPECIAL_PID) {
-                        if (crm_is_true(getenv("PCMK_fail_fast"))) {
+                        if (crm_is_true(pcmk__env_option(PCMK__ENV_FAIL_FAST))) {
                             crm_crit("Cannot reliably track pre-existing"
                                      " authentic process behind %s IPC on this"
-                                     " platform and PCMK_fail_fast requested",
+                                     " platform and PCMK_" PCMK__ENV_FAIL_FAST
+                                     " requested",
                                      pcmk_children[i].endpoint);
                             return EOPNOTSUPP;
                         } else if (pcmk_children[i].respawn_count == WAIT_TRIES) {
@@ -727,9 +730,9 @@ find_and_track_existing_processes(void)
                                        " on this platform untrackable, process"
                                        " behind %s IPC is stable (was in %d"
                                        " previous samples) so rather than"
-                                       " bailing out (PCMK_fail_fast not"
-                                       " requested), we just switch to a less"
-                                       " optimal IPC liveness monitoring"
+                                       " bailing out (PCMK_" PCMK__ENV_FAIL_FAST
+                                       " not requested), we just switch to a"
+                                       " less optimal IPC liveness monitoring"
                                        " (not very suitable for heavy load)",
                                        pcmk_children[i].name, WAIT_TRIES - 1);
                             crm_warn("The process behind %s IPC cannot be"
@@ -822,7 +825,7 @@ init_children_processes(void *user_data)
      *
      * This may be useful for the daemons to know
      */
-    setenv("PCMK_respawned", "true", 1);
+    pcmk__set_env_option(PCMK__ENV_RESPAWNED, "true", false);
     pacemakerd_state = XML_PING_ATTR_PACEMAKERDSTATE_RUNNING;
     return TRUE;
 }