Merge pull request #3974 from clumens/execd-msgs

Low: daemons: Get rid of some logged warnings in execd.

Author: nrwahl2

daemons/execd/execd_messages.c

@@ -52,11 +52,22 @@ handle_ipc_fwd_request(pcmk__request_t *request)
         return NULL;
     }
 
-    ipc_proxy_forward_client(request->ipc_client, request->xml);
+    rc = ipc_proxy_forward_client(request->ipc_client, request->xml);
 #else
     rc = EPROTONOSUPPORT;
 #endif
 
+    if (rc == pcmk_rc_ok) {
+        /* Coverity gets confused by the #ifdef above and thinks this block
+         * is unreachable due to rc always being EPROTONOSUPPORT.
+         */
+        // coverity[dead_error_line]
+        pcmk__set_result(&request->result, CRM_EX_OK, PCMK_EXEC_DONE, NULL);
+    } else {
+        pcmk__set_result(&request->result, pcmk_rc2exitc(rc), PCMK_EXEC_ERROR,
+                         pcmk_rc_str(rc));
+    }
+
     pcmk__xe_get_int(request->xml, PCMK__XA_LRMD_CALLID, &call_id);
 
     /* Create a generic reply since forwarding doesn't create a more specific one */
@@ -196,6 +207,8 @@ handle_poke_request(pcmk__request_t *request)
 
     pcmk__xe_get_int(request->xml, PCMK__XA_LRMD_CALLID, &call_id);
 
+    pcmk__set_result(&request->result, CRM_EX_OK, PCMK_EXEC_DONE, NULL);
+
     /* Create a generic reply since this doesn't create a more specific one */
     reply = execd_create_reply(pcmk_ok, call_id);
     return reply;
@@ -297,11 +310,13 @@ handle_rsc_info_request(pcmk__request_t *request)
 
     /* This returns ENODEV if the resource isn't in the cache which will be
      * logged as an error.  However, this isn't fatal to the client - it may
-     * querying to see if the resource exists before deciding to register it.
+     * be querying to see if the resource exists before deciding to register it.
+     * Thus, we'll ignore an ENODEV to prevent a warning message from being
+     * logged.
      */
     rc = execd_process_get_rsc_info(request->xml, call_id, &reply);
 
-    if (rc == pcmk_rc_ok) {
+    if ((rc == pcmk_rc_ok) || (rc == ENODEV)) {
         pcmk__set_result(&request->result, CRM_EX_OK, PCMK_EXEC_DONE, NULL);
     } else {
         pcmk__set_result(&request->result, pcmk_rc2exitc(rc), PCMK_EXEC_ERROR,

daemons/execd/pacemaker-execd.h

@@ -88,7 +88,7 @@ void ipc_proxy_init(void);
 void ipc_proxy_cleanup(void);
 void ipc_proxy_add_provider(pcmk__client_t *client);
 void ipc_proxy_remove_provider(pcmk__client_t *client);
-void ipc_proxy_forward_client(pcmk__client_t *client, xmlNode *xml);
+int ipc_proxy_forward_client(pcmk__client_t *client, xmlNode *xml);
 pcmk__client_t *ipc_proxy_get_provider(void);
 int ipc_proxy_shutdown_req(pcmk__client_t *ipc_proxy);
 void remoted_spawn_pidone(int argc, char **argv);

daemons/execd/remoted_proxy.c

@@ -151,7 +151,7 @@ cib_proxy_accept_ro(qb_ipcs_connection_t * c, uid_t uid, gid_t gid)
     return ipc_proxy_accept(c, uid, gid, PCMK__SERVER_BASED_RO);
 }
 
-void
+int
 ipc_proxy_forward_client(pcmk__client_t *ipc_proxy, xmlNode *xml)
 {
     const char *session = pcmk__xe_get(xml, PCMK__XA_LRMD_IPC_SESSION);
@@ -166,12 +166,12 @@ ipc_proxy_forward_client(pcmk__client_t *ipc_proxy, xmlNode *xml)
 
     if (pcmk__str_eq(msg_type, LRMD_IPC_OP_SHUTDOWN_ACK, pcmk__str_casei)) {
         handle_shutdown_ack();
-        return;
+        return rc;
     }
 
     if (pcmk__str_eq(msg_type, LRMD_IPC_OP_SHUTDOWN_NACK, pcmk__str_casei)) {
         handle_shutdown_nack();
-        return;
+        return rc;
     }
 
     ipc_client = pcmk__find_client_by_id(session);
@@ -181,7 +181,7 @@ ipc_proxy_forward_client(pcmk__client_t *ipc_proxy, xmlNode *xml)
         pcmk__xe_set(msg, PCMK__XA_LRMD_IPC_SESSION, session);
         lrmd_server_send_notify(ipc_proxy, msg);
         pcmk__xml_free(msg);
-        return;
+        return rc;
     }
 
     /* This is an event or response from the ipc provider
@@ -223,6 +223,8 @@ ipc_proxy_forward_client(pcmk__client_t *ipc_proxy, xmlNode *xml)
         crm_warn("Could not proxy IPC to client %s: %s " QB_XS " rc=%d",
                  ipc_client->id, pcmk_rc_str(rc), rc);
     }
+
+    return rc;
 }
 
 static int32_t