From a9eb3272f074fc464e4567d4f85c2265b1a3e53a Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 20 Dec 2021 10:21:53 +0900
Subject: [PATCH] bulk: Reduce default yield_frequency

... following the change in swift[1].

[1] 892c226ce57a8367db46409fe35257ae41c558f7

Related-Bug: #1270246
Change-Id: Id6d43eed1df1f67fee50e62d4e27bb9d335f56ff
---
 manifests/proxy/bulk.pp                                     | 4 ++--
 .../notes/bulk-yield_frequency-2ad6dc679ef17452.yaml        | 5 +++++
 spec/classes/swift_proxy_bulk_spec.rb                       | 6 +++---
 3 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 releasenotes/notes/bulk-yield_frequency-2ad6dc679ef17452.yaml

diff --git a/manifests/proxy/bulk.pp b/manifests/proxy/bulk.pp
index c01bb28e..31950967 100644
--- a/manifests/proxy/bulk.pp
+++ b/manifests/proxy/bulk.pp
@@ -35,13 +35,13 @@
 # [*yield_frequency*]
 # The frequency the server will spit out an ' ' to keep the connection alive
 # while its processing the request.
-# Default to 60.
+# Default to 10.
 #
 class swift::proxy::bulk(
   $max_containers_per_extraction = '10000',
   $max_failed_extractions        = '1000',
   $max_deletes_per_request       = '10000',
-  $yield_frequency               = '60',
+  $yield_frequency               = '10',
 ) {
 
   include swift::deps
diff --git a/releasenotes/notes/bulk-yield_frequency-2ad6dc679ef17452.yaml b/releasenotes/notes/bulk-yield_frequency-2ad6dc679ef17452.yaml
new file mode 100644
index 00000000..479201ec
--- /dev/null
+++ b/releasenotes/notes/bulk-yield_frequency-2ad6dc679ef17452.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Default value of ``swift::proxy::bulk`` has been changed from ``60`` to
+    ``10``, which is consistent with the service default.
diff --git a/spec/classes/swift_proxy_bulk_spec.rb b/spec/classes/swift_proxy_bulk_spec.rb
index e6a46d52..0230e7e5 100644
--- a/spec/classes/swift_proxy_bulk_spec.rb
+++ b/spec/classes/swift_proxy_bulk_spec.rb
@@ -27,7 +27,7 @@ describe 'swift::proxy::bulk' do
       it { is_expected.to contain_swift_proxy_config('filter:bulk/max_containers_per_extraction').with_value('10000') }
       it { is_expected.to contain_swift_proxy_config('filter:bulk/max_failed_extractions').with_value('1000') }
       it { is_expected.to contain_swift_proxy_config('filter:bulk/max_deletes_per_request').with_value('10000') }
-      it { is_expected.to contain_swift_proxy_config('filter:bulk/yield_frequency').with_value('60') }
+      it { is_expected.to contain_swift_proxy_config('filter:bulk/yield_frequency').with_value('10') }
     end
 
     describe "when overriding default parameters" do
@@ -36,7 +36,7 @@ describe 'swift::proxy::bulk' do
           :max_containers_per_extraction => 5000,
           :max_failed_extractions        => 500,
           :max_deletes_per_request       => 5000,
-          :yield_frequency               => 10
+          :yield_frequency               => 60,
         }
       end
 
@@ -44,7 +44,7 @@ describe 'swift::proxy::bulk' do
       it { is_expected.to contain_swift_proxy_config('filter:bulk/max_containers_per_extraction').with_value('5000') }
       it { is_expected.to contain_swift_proxy_config('filter:bulk/max_failed_extractions').with_value('500') }
       it { is_expected.to contain_swift_proxy_config('filter:bulk/max_deletes_per_request').with_value('5000') }
-      it { is_expected.to contain_swift_proxy_config('filter:bulk/yield_frequency').with_value('10') }
+      it { is_expected.to contain_swift_proxy_config('filter:bulk/yield_frequency').with_value('60') }
     end
   end