From 2aa7ff67bb66dff1d16c6a4cb258ce09d23e6f63 Mon Sep 17 00:00:00 2001
From: Yu Ming Zhu <yzhu@redhat.com>
Date: Jul 27 2020 08:58:42 +0000
Subject: [PATCH 1/2] kojira: remove unused delete_batch_size


fixes: #2396

---

diff --git a/docs/source/utils.rst b/docs/source/utils.rst
index f1e5e16..e0db444 100644
--- a/docs/source/utils.rst
+++ b/docs/source/utils.rst
@@ -81,10 +81,6 @@ especially in relation to throttling in creating ``newRepo`` tasks.
     Overall limit on running tasks is set here. It involves all
     ``newRepo`` tasks spawned by kojira and also by other users.
 
-``delete_batch_size = 3``
-    How many repos are being removed from disk in one iteration. This
-    generally doesn't need to be changed.
-
 ``check_external_repos = false``
     If True, monitor external repos and trigger the appropriate Koji repo
     regenerations when they change.
diff --git a/util/kojira b/util/kojira
index 4ee87c9..91686f7 100755
--- a/util/kojira
+++ b/util/kojira
@@ -1091,7 +1091,6 @@ def get_options():
                 'max_repo_tasks': 4,
                 'max_repo_tasks_maven': 2,
                 'repo_tasks_limit': 10,
-                'delete_batch_size': 3,
                 'deleted_repo_lifetime': 7 * 24 * 3600,
                 # XXX should really be called expired_repo_lifetime
                 'dist_repo_lifetime': 7 * 24 * 3600,
@@ -1106,9 +1105,8 @@ def get_options():
     if config.has_section(section):
         int_opts = ('deleted_repo_lifetime', 'max_repo_tasks', 'repo_tasks_limit',
                     'retry_interval', 'max_retries', 'offline_retry_interval',
-                    'max_delete_processes', 'max_repo_tasks_maven',
-                    'delete_batch_size', 'dist_repo_lifetime', 'sleeptime',
-                    'recent_tasks_lifetime')
+                    'max_delete_processes', 'max_repo_tasks_maven', 'dist_repo_lifetime',
+                    'sleeptime', 'recent_tasks_lifetime')
         str_opts = ('topdir', 'server', 'user', 'password', 'logfile', 'principal', 'keytab',
                     'cert', 'ca', 'serverca', 'debuginfo_tags', 'queue_file',
                     'source_tags', 'separate_source_tags', 'ignore_tags')  # FIXME: remove ca here

From 92dd493e98917b1d4f670797c82e7d8963115c06 Mon Sep 17 00:00:00 2001
From: Yu Ming Zhu <yzhu@redhat.com>
Date: Jul 27 2020 08:59:40 +0000
Subject: [PATCH 2/2] add delete_batch_size into legacy_opts


---

diff --git a/util/kojira b/util/kojira
index 91686f7..3f75160 100755
--- a/util/kojira
+++ b/util/kojira
@@ -1112,7 +1112,7 @@ def get_options():
                     'source_tags', 'separate_source_tags', 'ignore_tags')  # FIXME: remove ca here
         bool_opts = ('verbose', 'debug', 'ignore_stray_repos', 'offline_retry',
                      'no_ssl_verify', 'check_external_repos')
-        legacy_opts = ('with_src')
+        legacy_opts = ('with_src', 'delete_batch_size')
         for name in config.options(section):
             if name in int_opts:
                 defaults[name] = config.getint(section, name)