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

Overview Repositories Revisions Requests Users Attributes Meta

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

From c5eb0f3bfcc30429722804de45582cb55b01fda3 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.
---
 daemons/pacemakerd/pacemakerd.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Index: pacemaker-1.1.18+20180430.b12c320f5/daemons/pacemakerd/pacemakerd.c
===================================================================
--- pacemaker-1.1.18+20180430.b12c320f5.orig/daemons/pacemakerd/pacemakerd.c
+++ pacemaker-1.1.18+20180430.b12c320f5/daemons/pacemakerd/pacemakerd.c
@@ -65,7 +65,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);
 static gboolean update_node_processes(uint32_t id, const char *uname,
                                       uint32_t procs);
 void update_process_clients(crm_client_t *client);
@@ -355,9 +354,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--) {
@@ -660,6 +656,7 @@ mcp_chown(const char *path, uid_t uid, g
     }
 }
 
+#if SUPPORT_PROCFS
 static gboolean
 check_active_before_startup_processes(gpointer user_data)
 {
@@ -695,6 +692,7 @@ check_active_before_startup_processes(gp
 
     return keep_tracking;
 }
+#endif // SUPPORT_PROCFS
 
 static void
 find_and_track_existing_processes(void)

Places

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

Places