Merge pull request #9474 from puppetlabs/backport-9458-to-7.x

[Backport 7.x] Clarify soft limit on number of facts

Author: mhashizume

lib/puppet/configurer.rb

@@ -130,7 +130,7 @@ def convert_catalog(result, duration, facts, options = {})
   end
 
   def warn_number_of_facts(size, max_number)
-    Puppet.warning _("The current total number of facts: %{size} exceeds the number of facts limit: %{max_size}") % { size: size, max_size: max_number }
+    Puppet.warning _("The current total number of fact values: %{size} exceeds the fact values limit: %{max_size}") % { size: size, max_size: max_number }
   end
 
   def warn_fact_name_length(name, max_length)

lib/puppet/defaults.rb

@@ -1768,7 +1768,9 @@ def self.initialize_default_settings!(settings)
     :number_of_facts_soft_limit => {
       :default    => 2048,
       :type       => :integer,
-      :desc       => "The soft limit for the total number of facts.",
+      :desc       => "The soft limit for the total number of fact values. This counts the
+        child elements of all facts (e.g. all items of an array or a hash), not just top
+        level facts.",
     },
     :payload_soft_limit => {
       :default    => 16 * 1024 * 1024,

spec/unit/configurer_spec.rb

@@ -268,7 +268,7 @@
       }
       Puppet::Node::Facts.indirection.save(facts)
 
-      expect(Puppet).to receive(:warning).with(/The current total number of facts: [1-9]* exceeds the number of facts limit: [1-9]*/)
+      expect(Puppet).to receive(:warning).with(/The current total number of fact values: [1-9]* exceeds the fact values limit: [1-9]*/)
       configurer.run
     end