From 216fd64013395c8b2afebdaa352fb65460652cf4 Mon Sep 17 00:00:00 2001 From: rallytime Date: Mon, 8 Oct 2018 10:51:01 -0400 Subject: [PATCH] Remove event_publisher_pub_hwm and salt_event_pub_hwm from documentation Fixes #49925 The `event_publisher_pub_hwm` and `salt_event_pub_hwm` configuration options were removed in #38723. (They are obsolete and not used within salt any longer.) When those options were removed, I neglected to remove them from the docs. This PR cleans up the references in the docs. --- conf/master | 18 ----------------- conf/suse/master | 18 ----------------- doc/ref/configuration/master.rst | 34 -------------------------------- 3 files changed, 70 deletions(-) diff --git a/conf/master b/conf/master index e88aa578c7c..13fb0096dd9 100644 --- a/conf/master +++ b/conf/master @@ -261,24 +261,6 @@ # The publisher interface ZeroMQPubServerChannel #pub_hwm: 1000 -# These two ZMQ HWM settings, salt_event_pub_hwm and event_publisher_pub_hwm -# are significant for masters with thousands of minions. When these are -# insufficiently high it will manifest in random responses missing in the CLI -# and even missing from the job cache. Masters that have fast CPUs and many -# cores with appropriate worker_threads will not need these set as high. - -# On deployment with 8,000 minions, 2.4GHz CPUs, 24 cores, 32GiB memory has -# these settings: -# -# salt_event_pub_hwm: 128000 -# event_publisher_pub_hwm: 64000 - -# ZMQ high-water-mark for SaltEvent pub socket -#salt_event_pub_hwm: 20000 - -# ZMQ high-water-mark for EventPublisher pub socket -#event_publisher_pub_hwm: 10000 - # The master may allocate memory per-event and not # reclaim it. # To set a high-water mark for memory allocation, use diff --git a/conf/suse/master b/conf/suse/master index e0a51c000fb..39769415210 100644 --- a/conf/suse/master +++ b/conf/suse/master @@ -263,24 +263,6 @@ syndic_user: salt # The publisher interface ZeroMQPubServerChannel #pub_hwm: 1000 -# These two ZMQ HWM settings, salt_event_pub_hwm and event_publisher_pub_hwm -# are significant for masters with thousands of minions. When these are -# insufficiently high it will manifest in random responses missing in the CLI -# and even missing from the job cache. Masters that have fast CPUs and many -# cores with appropriate worker_threads will not need these set as high. - -# On deployment with 8,000 minions, 2.4GHz CPUs, 24 cores, 32GiB memory has -# these settings: -# -# salt_event_pub_hwm: 128000 -# event_publisher_pub_hwm: 64000 - -# ZMQ high-water-mark for SaltEvent pub socket -#salt_event_pub_hwm: 20000 - -# ZMQ high-water-mark for EventPublisher pub socket -#event_publisher_pub_hwm: 10000 - # The master may allocate memory per-event and not # reclaim it. # To set a high-water mark for memory allocation, use diff --git a/doc/ref/configuration/master.rst b/doc/ref/configuration/master.rst index d57205a2fcd..e94c2f40785 100644 --- a/doc/ref/configuration/master.rst +++ b/doc/ref/configuration/master.rst @@ -1723,40 +1723,6 @@ The listen queue size of the ZeroMQ backlog. zmq_backlog: 1000 -.. conf_master:: salt_event_pub_hwm -.. conf_master:: event_publisher_pub_hwm - -``salt_event_pub_hwm`` and ``event_publisher_pub_hwm`` ------------------------------------------------------- - -These two ZeroMQ High Water Mark settings, ``salt_event_pub_hwm`` and -``event_publisher_pub_hwm`` are significant for masters with thousands of -minions. When these are insufficiently high it will manifest in random -responses missing in the CLI and even missing from the job cache. Masters -that have fast CPUs and many cores with appropriate ``worker_threads`` -will not need these set as high. - -The ZeroMQ high-water-mark for the ``SaltEvent`` pub socket default is: - -.. code-block:: yaml - - salt_event_pub_hwm: 20000 - -The ZeroMQ high-water-mark for the ``EventPublisher`` pub socket default is: - -.. code-block:: yaml - - event_publisher_pub_hwm: 10000 - -As an example, on single master deployment with 8,000 minions, 2.4GHz CPUs, -24 cores, and 32GiB memory has these settings: - -.. code-block:: yaml - - salt_event_pub_hwm: 128000 - event_publisher_pub_hwm: 64000 - - .. _master-module-management: Master Module Management