File 0001-Low-pacemakerd-only-one-active-process-che... of Package pacemaker.26126

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Low-pacemakerd-only-one-active-process-check-needed-1.1.patch of Package pacemaker.26126

From 8dd1c76d571695cd83b8b6ae362485386759386e Mon Sep 17 00:00:00 2001
From: Ken Gaillot <kgaillot@redhat.com>
Date: Mon, 3 Dec 2018 10:57:19 -0600
Subject: [PATCH] Low: pacemakerd: only one active process check needed

PCMK_PROCESS_CHECK_INTERVAL has been 5 seconds since cf22c42,
meaning that the additional "more frequent" check isn't needed.
---
 mcp/pacemaker.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/mcp/pacemaker.c b/mcp/pacemaker.c
index 40a2de2a8..2986be651 100644
--- a/mcp/pacemaker.c
+++ b/mcp/pacemaker.c
@@ -71,7 +71,6 @@ static pcmk_child_t pcmk_children[] = {
 /* *INDENT-ON* */
 
 static gboolean start_child(pcmk_child_t * child);
-static gboolean check_active_before_startup_processes(gpointer user_data);
 void update_process_clients(crm_client_t *client);
 void update_process_peers(void);
 
@@ -392,9 +391,6 @@ pcmk_shutdown_worker(gpointer user_data)
     if (phase == 0) {
         crm_notice("Shutting down Pacemaker");
         phase = max;
-
-        /* Add a second, more frequent, check to speed up shutdown */
-        g_timeout_add_seconds(5, check_active_before_startup_processes, NULL);
     }
 
     for (; phase > 0; phase--) {
@@ -700,6 +696,7 @@ mcp_chown(const char *path, uid_t uid, gid_t gid)
     }
 }
 
+#if SUPPORT_PROCFS
 static gboolean
 check_active_before_startup_processes(gpointer user_data)
 {
@@ -735,6 +732,7 @@ check_active_before_startup_processes(gpointer user_data)
 
     return keep_tracking;
 }
+#endif // SUPPORT_PROCFS
 
 static void
 find_and_track_existing_processes(void)
-- 
2.16.4

Places

File 0001-Low-pacemakerd-only-one-active-process-check-needed-1.1.patch of Package pacemaker.26126

Places