From a55536cad0b525950a7209a687561cf74acc614b Mon Sep 17 00:00:00 2001
From: Justin Stoller <justin.stoller@gmail.com>
Date: Tue, 5 May 2020 15:24:08 -0700
Subject: [PATCH 1/2] Revert "Increase default pool_size to 4"

This reverts commit f9f801bf7c87a78194b8a7c1b0c567678791ee4b.
---
 lib/r10k/puppetfile.rb | 2 +-
 lib/r10k/settings.rb   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/r10k/puppetfile.rb b/lib/r10k/puppetfile.rb
index 648e88541..070d93913 100644
--- a/lib/r10k/puppetfile.rb
+++ b/lib/r10k/puppetfile.rb
@@ -10,7 +10,7 @@ class Puppetfile
 
   include R10K::Settings::Mixin
 
-  def_setting_attr :pool_size, 4
+  def_setting_attr :pool_size, 1
 
   include R10K::Logging
 
diff --git a/lib/r10k/settings.rb b/lib/r10k/settings.rb
index e29602696..20333dc62 100644
--- a/lib/r10k/settings.rb
+++ b/lib/r10k/settings.rb
@@ -159,8 +159,8 @@ def self.global_settings
         }),
 
         Definition.new(:pool_size, {
-          :desc => "The amount of threads used to concurrently install modules. The default value is 4: install four modules at a time.",
-          :default => 4,
+          :desc => "The amount of threads used to concurrently install modules. The default value is 1: install one module at a time.",
+          :default => 1,
           :validate => lambda do |value|
             if !value.is_a?(Integer)
               raise ArgumentError, "The pool_size setting should be an integer, not a #{value.class}"

From 007d37b8bdf10bcbb54adad55c73bc6f3d5ac685 Mon Sep 17 00:00:00 2001
From: Justin Stoller <justin.stoller@gmail.com>
Date: Tue, 5 May 2020 15:27:33 -0700
Subject: [PATCH 2/2] (maint) Remove CHANGELOG note re default thread pool size

After updating the default pool_size, a race condition was
found when initializing our local git cache. See
https://github.com/puppetlabs/r10k/issues/1058 for the issue in detail.

When attempting a fix we realized that there were multiple copies of the
code to iterate over modules to manage. See
https://github.com/puppetlabs/r10k/pull/1059 for a first attempt at this
problem and discussion.

In order to meet our current timelines, the default will need to reverted
until we can fix this issue properly. Hence this commit and a55536cad.

This commit was necessary because the CHANGELOG has been refactored since
the commit referencing the default was added.
---
 CHANGELOG.mkd | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.mkd b/CHANGELOG.mkd
index 0e459d2fd..27214b40c 100644
--- a/CHANGELOG.mkd
+++ b/CHANGELOG.mkd
@@ -3,7 +3,6 @@ CHANGELOG
 
 Unreleased
 ----
-- Increase `pool_size` default to 4 from 1 [#1044](https://github.com/puppetlabs/r10k/pull/1044)
 - Add exec environment source type. The exec source type allows for the implementation of external environment sources [#1042](https://github.com/puppetlabs/r10k/pull/1042)
 
 3.4.1