Merge pull request #1955 from kgaillot/fixes

Miscellaneous unrelated small changes

.gitignore

@@ -138,7 +138,6 @@ publican.cfg
 /doc/HTML
 /doc/abi_dumps
 /doc/abi-check
-/doc/acls.html
 /doc/api/*
 /doc/compat_reports
 /doc/crm_fencing.html
@@ -213,6 +212,7 @@ pacemaker-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]
 /cts/HBDummy
 /doc/Clusters_from_Scratch.txt
 /doc/Pacemaker_Explained.txt
+/doc/acls.html
 /fencing
 /lrmd
 /mcp

configure.ac

@@ -1885,8 +1885,6 @@ CFLAGS_COPY="$CFLAGS"
 AC_SUBST(CFLAGS_COPY)
 
 AC_SUBST(LIBADD_DL)        dnl extra flags for dynamic linking libraries
-AC_SUBST(LIBADD_INTL)        dnl extra flags for GNU gettext stuff...
-
 AC_SUBST(LOCALE)
 
 dnl Options for cleaning up the compiler output

daemons/controld/controld_execd.c

@@ -762,9 +762,7 @@ is_rsc_active(lrm_state_t * lrm_state, const char *rsc_id)
 
     } else if (entry->last->rc == PCMK_OCF_OK
                && safe_str_eq(entry->last->op_type, CRMD_ACTION_MIGRATE)) {
-        /* a stricter check is too complex...
-         * leave that to the PE
-         */
+        // A stricter check is too complex ... leave that to the scheduler
         return FALSE;
 
     } else if (entry->last->rc == PCMK_OCF_NOT_RUNNING) {

daemons/controld/controld_fencing.c

@@ -530,7 +530,7 @@ tengine_stonith_notify(stonith_t *st, stonith_event_t *st_event)
              * Unfortunately, the controller doesn't have a simple, reliable way
              * to map hosts to guests. It might be possible to track this in the
              * peer cache via crm_remote_peer_cache_refresh(). For now, we rely
-             * on the PE creating fence pseudo-events for the guests.
+             * on the scheduler creating fence pseudo-events for the guests.
              */
 
             if (st_event->client_origin

daemons/controld/controld_fsa.c

@@ -397,7 +397,7 @@ s_crmd_fsa_actions(fsa_data_t * fsa_data)
             /*
              * Low(er) priority actions
              * Make sure the CIB is always updated before invoking the
-             * PE, and the PE before the TE
+             * scheduler, and the scheduler before the transition engine.
              */
         } else if (fsa_actions & A_TE_HALT) {
             do_fsa_action(fsa_data, A_TE_HALT, do_te_invoke);

daemons/controld/controld_join_dc.c

@@ -261,8 +261,8 @@ do_dc_join_offer_one(long long action,
         join_make_offer(NULL, member, NULL);
     }
 
-    /* this was a genuine join request, cancel any existing
-     * transition and invoke the PE
+    /* This was a genuine join request; cancel any existing transition and
+     * invoke the scheduler.
      */
     abort_transition(INFINITY, tg_restart, "Node join", NULL);
 

daemons/controld/controld_schedulerd.c

@@ -164,7 +164,7 @@ pe_subsystem_new()
 
 /*!
  * \internal
- * \brief Send an XML message to the PE
+ * \brief Send an XML message to the scheduler
  *
  * \param[in] cmd  XML message to send
  *

daemons/fenced/fenced_commands.c

@@ -1962,7 +1962,7 @@ stonith_query(xmlNode * msg, const char *remote_peer, const char *client_id, int
     const char *action = NULL;
     const char *target = NULL;
     int timeout = 0;
-    xmlNode *dev = get_xpath_object("//@" F_STONITH_ACTION, msg, LOG_TRACE);
+    xmlNode *dev = get_xpath_object("//@" F_STONITH_ACTION, msg, LOG_NEVER);
 
     crm_element_value_int(msg, F_STONITH_TIMEOUT, &timeout);
     if (dev) {
@@ -2703,7 +2703,7 @@ stonith_command(crm_client_t * client, uint32_t id, uint32_t flags, xmlNode * re
      */
     char *op = crm_element_value_copy(request, F_STONITH_OPERATION);
 
-    if (get_xpath_object("//" T_STONITH_REPLY, request, LOG_TRACE)) {
+    if (get_xpath_object("//" T_STONITH_REPLY, request, LOG_NEVER)) {
         is_reply = TRUE;
     }
 

daemons/fenced/fenced_history.c

@@ -1,5 +1,7 @@
 /*
- * Copyright 2009-2018 Andrew Beekhof <[email protected]>
+ * Copyright 2009-2019 the Pacemaker project contributors
+ *
+ * The version control history for this file may have further details.
  *
  * This source code is licensed under the GNU General Public License version 2
  * or later (GPLv2+) WITHOUT ANY WARRANTY.
@@ -398,7 +400,7 @@ stonith_fence_history(xmlNode *msg, xmlNode **output,
 {
     int rc = 0;
     const char *target = NULL;
-    xmlNode *dev = get_xpath_object("//@" F_STONITH_TARGET, msg, LOG_TRACE);
+    xmlNode *dev = get_xpath_object("//@" F_STONITH_TARGET, msg, LOG_NEVER);
     xmlNode *out_history = NULL;
 
     if (dev) {
@@ -439,8 +441,8 @@ stonith_fence_history(xmlNode *msg, xmlNode **output,
                                         NULL);
         } else if (remote_peer &&
                    !safe_str_eq(remote_peer, stonith_our_uname)) {
-            xmlNode *history =
-                get_xpath_object("//" F_STONITH_HISTORY_LIST, msg, LOG_TRACE);
+            xmlNode *history = get_xpath_object("//" F_STONITH_HISTORY_LIST,
+                                                msg, LOG_NEVER);
             GHashTable *received_history =
                 history?stonith_xml_history_to_list(history):NULL;
 

daemons/fenced/fenced_remote.c

@@ -496,7 +496,8 @@ remote_op_done(remote_fencing_op_t * op, xmlNode * data, int rc, int dup)
     }
 
     if (!op->delegate && data && rc != -ENODEV && rc != -EHOSTUNREACH) {
-        xmlNode *ndata = get_xpath_object("//@" F_STONITH_DELEGATE, data, LOG_TRACE);
+        xmlNode *ndata = get_xpath_object("//@" F_STONITH_DELEGATE, data,
+                                          LOG_NEVER);
         if(ndata) {
             op->delegate = crm_element_value_copy(ndata, F_STONITH_DELEGATE);
         } else { 
@@ -963,7 +964,7 @@ void *
 create_remote_stonith_op(const char *client, xmlNode * request, gboolean peer)
 {
     remote_fencing_op_t *op = NULL;
-    xmlNode *dev = get_xpath_object("//@" F_STONITH_TARGET, request, LOG_TRACE);
+    xmlNode *dev = get_xpath_object("//@" F_STONITH_TARGET, request, LOG_NEVER);
     int call_options = 0;
 
     init_stonith_remote_op_hash_table(&stonith_remote_op_list);

daemons/fenced/pacemaker-fenced.c

@@ -885,7 +885,7 @@ node_has_attr(const char *node, const char *name, const char *value)
                  "/" XML_CIB_TAG_NODE "[@uname='%s']/" XML_TAG_ATTR_SETS
                  "/" XML_CIB_TAG_NVPAIR "[@name='%s' and @value='%s']",
                  node, name, value);
-    match = get_xpath_object(xpath, local_cib, LOG_TRACE);
+    match = get_xpath_object(xpath, local_cib, LOG_NEVER);
 
     CRM_CHECK(n < XPATH_MAX, return FALSE);
     return (match != NULL);
@@ -1051,7 +1051,8 @@ update_cib_cache_cb(const char *event, xmlNode * msg)
 
     crm_peer_caches_refresh(local_cib);
 
-    stonith_enabled_xml = get_xpath_object("//nvpair[@name='stonith-enabled']", local_cib, LOG_TRACE);
+    stonith_enabled_xml = get_xpath_object("//nvpair[@name='stonith-enabled']",
+                                           local_cib, LOG_NEVER);
     if (stonith_enabled_xml) {
         stonith_enabled_s = crm_element_value(stonith_enabled_xml, XML_NVPAIR_ATTR_VALUE);
     }
@@ -1060,7 +1061,8 @@ update_cib_cache_cb(const char *event, xmlNode * msg)
         long timeout_ms = 0;
         const char *value = NULL;
 
-        stonith_watchdog_xml = get_xpath_object("//nvpair[@name='stonith-watchdog-timeout']", local_cib, LOG_TRACE);
+        stonith_watchdog_xml = get_xpath_object("//nvpair[@name='stonith-watchdog-timeout']",
+                                                local_cib, LOG_NEVER);
         if (stonith_watchdog_xml) {
             value = crm_element_value(stonith_watchdog_xml, XML_NVPAIR_ATTR_VALUE);
         }

daemons/pacemakerd/pacemakerd.c

@@ -779,8 +779,8 @@ mcp_chown(const char *path, uid_t uid, gid_t gid)
  */
 static int
 pcmk_child_active(pcmk_child_t *child) {
-    static uid_t cl_uid = 0;
-    static gid_t cl_gid = 0;
+    uid_t cl_uid = 0;
+    gid_t cl_gid = 0;
     const uid_t root_uid = 0;
     const gid_t root_gid = 0;
     const uid_t *ref_uid;
@@ -799,8 +799,7 @@ pcmk_child_active(pcmk_child_t *child) {
         ref_uid = (child->uid != NULL) ? &cl_uid : &root_uid;
         ref_gid = (child->uid != NULL) ? &cl_gid : &root_gid;
 
-        if (child->uid != NULL && !cl_uid && !cl_gid
-                && crm_user_lookup(CRM_DAEMON_USER, &cl_uid, &cl_gid) < 0) {
+        if ((child->uid != NULL) && (pcmk_daemon_user(&cl_uid, &cl_gid) < 0)) {
             crm_err("Could not find user and group IDs for user %s",
                     CRM_DAEMON_USER);
             ret = -1;
@@ -1309,7 +1308,7 @@ main(int argc, char **argv)
         }
     }
 
-    if (crm_user_lookup(CRM_DAEMON_USER, &pcmk_uid, &pcmk_gid) < 0) {
+    if (pcmk_daemon_user(&pcmk_uid, &pcmk_gid) < 0) {
         crm_err("Cluster user %s does not exist, aborting Pacemaker startup", CRM_DAEMON_USER);
         crm_exit(CRM_EX_NOUSER);
     }

daemons/pacemakerd/pcmkd_corosync.c

@@ -267,7 +267,7 @@ mcp_read_config(void)
 
     if(local_handle){
         gid_t gid = 0;
-        if (crm_user_lookup(CRM_DAEMON_USER, NULL, &gid) < 0) {
+        if (pcmk_daemon_user(NULL, &gid) < 0) {
             crm_warn("Could not authorize group with corosync " CRM_XS
                      " No group found for user %s", CRM_DAEMON_USER);