Merge pull request #3896 from clumens/revert-ipc-split

Revert ipc split merge

Author: nrwahl2

ChangeLog

@@ -1,5 +1,5 @@
 * Thu Jun 19 2025 Chris Lumens <clumens@redhat.com> Pacemaker-2.1.10
-- 98 commits with 93 files changed, 1342 insertions(+), 867 deletions(-)
+- 101 commits with 86 files changed, 1294 insertions(+), 607 deletions(-)
 
 - Fixes since Pacemaker-2.1.9
   + build: Fix default pacemaker-remoted path on Fedora >= 42
@@ -8,9 +8,8 @@
   + executor: avoid use-after-free upon shutdown
   + libcrmcluster: better detect remote nodes in peer cache
   + libcrmcluster: use pcmk__cluster_get_xml_id() when possible
-  + libcrmcommon: Consistently free iov on error.
-  + libcrmservices: Fix overrides for systemd resources
-  + libcrmservices: Don't leak msg if systemd_proxy is NULL.
+  + libcrmservice: Fix overrides for systemd resources
+  + libcrmservice: Don't leak msg if systemd_proxy is NULL.
   + libpacemaker: set fail-count to INFINITY for fatal failures
   + libpe_status: consider parents of an unmanaged resource active on the node
   + pacemaker-attrd: bail earlier if value won't be written
@@ -27,9 +26,6 @@
 
 - Public API changes since Pacemaker-2.1.9
   + libcrmcommon: add pcmk_common_cleanup()
-  + libcrmcommon: Deprecate crm_ipc_compressed.
-  + libcrmcommon: Deprecate max_size parameter to mainloop_add_ipc_client.
-  + libcrmcommon: Ignore the max_size parameter in crm_ipc_new.
 
 * Thu Oct 31 2024 Ken Gaillot <kgaillot@redhat.com> Pacemaker-2.1.9
 - 169 commits with 252 files changed, 4498 insertions(+), 2259 deletions(-)

daemons/based/based_notify.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2025 the Pacemaker project contributors
+ * Copyright 2004-2024 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
@@ -110,19 +110,19 @@ cib_notify_send(const xmlNode *xml)
     struct cib_notification_s update;
 
     ssize_t bytes = 0;
-    int rc = pcmk__ipc_prepare_iov(0, xml, &iov, &bytes);
+    int rc = pcmk__ipc_prepare_iov(0, xml, 0, &iov, &bytes);
 
     if (rc == pcmk_rc_ok) {
         update.msg = xml;
         update.iov = iov;
         update.iov_size = bytes;
         pcmk__foreach_ipc_client(cib_notify_send_one, &update);
-        pcmk_free_ipc_event(iov);
 
     } else {
         crm_notice("Could not notify clients: %s " CRM_XS " rc=%d",
                    pcmk_rc_str(rc), rc);
     }
+    pcmk_free_ipc_event(iov);
 }
 
 static void

doc/sphinx/Pacemaker_Explained/local-options.rst

@@ -639,6 +639,19 @@ environment variables when Pacemaker daemons start up.
        * ``posix``
        * ``sysv``
 
+   * - .. _pcmk_ipc_buffer:
+
+       .. index::
+          pair: node option; PCMK_ipc_buffer
+
+       PCMK_ipc_buffer
+     - :ref:`nonnegative integer <nonnegative_integer>`
+     - 131072
+     - *Advanced Use Only:* Specify an IPC buffer size in bytes. This can be
+       useful when connecting to large clusters that result in messages
+       exceeding the default size (which will also result in log messages
+       referencing this variable).
+
    * - .. _pcmk_cluster_type:
 
        .. index::

etc/sysconfig/pacemaker.in

@@ -319,6 +319,14 @@
 #
 # Default: PCMK_ipc_type="shared-mem"
 
+# PCMK_ipc_buffer (Advanced Use Only)
+#
+# Specify an IPC buffer size in bytes. This can be useful when connecting to
+# large clusters that result in messages exceeding the default size (which will
+# also result in log messages referencing this variable).
+#
+# Default: PCMK_ipc_buffer="131072"
+
 
 ## Cluster type
 

include/crm/common/ipc.h

@@ -162,7 +162,7 @@ int pcmk_ipc_purge_node(pcmk_ipc_api_t *api, const char *node_name,
 enum crm_ipc_flags
 {
     crm_ipc_flags_none              = UINT32_C(0),
-    //! \deprecated Since 2.1.10
+    //! Message has been compressed
     crm_ipc_compressed              = (UINT32_C(1) << 0),
     //! _ALL_ replies to proxied connections need to be sent as events
     crm_ipc_proxied                 = (UINT32_C(1) << 8),

include/crm/common/ipc_internal.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2025 the Pacemaker project contributors
+ * Copyright 2013-2024 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
@@ -251,6 +251,7 @@ int pcmk__ipc_send_ack_as(const char *function, int line, pcmk__client_t *c,
     pcmk__ipc_send_ack_as(__func__, __LINE__, (c), (req), (flags), (tag), (ver), (st))
 
 int pcmk__ipc_prepare_iov(uint32_t request, const xmlNode *message,
+                          uint32_t max_send_size,
                           struct iovec **result, ssize_t *bytes);
 int pcmk__ipc_send_xml(pcmk__client_t *c, uint32_t request,
                        const xmlNode *message, uint32_t flags);

include/crm/common/mainloop.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2025 the Pacemaker project contributors
+ * Copyright 2009-2024 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
@@ -130,7 +130,6 @@ qb_ipcs_service_t *mainloop_add_ipc_server_with_prio(const char *name,
 
 void mainloop_del_ipc_server(qb_ipcs_service_t * server);
 
-// @COMPAT max_size parameter is deprecated and unused since 2.1.10
 mainloop_io_t *mainloop_add_ipc_client(const char *name, int priority, size_t max_size,
                                        void *userdata, struct ipc_client_callbacks *callbacks);
 

include/crm/common/options_internal.h

@@ -129,6 +129,7 @@ bool pcmk__valid_stonith_watchdog_timeout(const char *value);
 #define PCMK__ENV_DH_MAX_BITS               "dh_max_bits"
 #define PCMK__ENV_DH_MIN_BITS               "dh_min_bits"
 #define PCMK__ENV_FAIL_FAST                 "fail_fast"
+#define PCMK__ENV_IPC_BUFFER                "ipc_buffer"
 #define PCMK__ENV_IPC_TYPE                  "ipc_type"
 #define PCMK__ENV_LOGFACILITY               "logfacility"
 #define PCMK__ENV_LOGFILE                   "logfile"

lib/cib/cib_native.c

@@ -1,6 +1,6 @@
 /*
  * Copyright 2004 International Business Machines
- * Later changes copyright 2004-2025 the Pacemaker project contributors
+ * Later changes copyright 2004-2024 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
@@ -314,7 +314,7 @@ cib_native_signon_raw(cib_t *cib, const char *name, enum cib_conn_type type,
 
     } else {
         native->source =
-            mainloop_add_ipc_client(channel, G_PRIORITY_HIGH, 0, cib,
+            mainloop_add_ipc_client(channel, G_PRIORITY_HIGH, 512 * 1024 /* 512k */ , cib,
                                     &cib_callbacks);
         native->ipc = mainloop_get_ipc_client(native->source);
     }

lib/common/crmcommon_private.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2025 the Pacemaker project contributors
+ * Copyright 2018-2024 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
@@ -257,6 +257,7 @@ typedef struct pcmk__ipc_methods_s {
 struct pcmk_ipc_api_s {
     enum pcmk_ipc_server server;          // Daemon this IPC API instance is for
     enum pcmk_ipc_dispatch dispatch_type; // How replies should be dispatched
+    size_t ipc_size_max;                  // maximum IPC buffer size
     crm_ipc_t *ipc;                       // IPC connection
     mainloop_io_t *mainloop_io;     // If using mainloop, I/O source for IPC
     bool free_on_disconnect;        // Whether disconnect should free object
@@ -268,7 +269,8 @@ struct pcmk_ipc_api_s {
 
 typedef struct pcmk__ipc_header_s {
     struct qb_ipc_response_header qb;
-    uint32_t size;
+    uint32_t size_uncompressed;
+    uint32_t size_compressed;
     uint32_t flags;
     uint8_t version;
 } pcmk__ipc_header_t;
@@ -281,6 +283,9 @@ void pcmk__call_ipc_callback(pcmk_ipc_api_t *api,
                              enum pcmk_ipc_event event_type,
                              crm_exit_t status, void *event_data);
 
+G_GNUC_INTERNAL
+unsigned int pcmk__ipc_buffer_size(unsigned int max);
+
 G_GNUC_INTERNAL
 bool pcmk__valid_ipc_header(const pcmk__ipc_header_t *header);