From e8efccb3d4664335b1f14e2b5a08121fa9eed2a1 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Feb 09 2012 07:50:00 +0000
Subject: - switch back to smaller BDB cache default (#752897)


---

diff --git a/rpm-4.9.x-mpsize.patch b/rpm-4.9.x-mpsize.patch
new file mode 100644
index 0000000..b18688f
--- /dev/null
+++ b/rpm-4.9.x-mpsize.patch
@@ -0,0 +1,28 @@
+commit d8cd36058b528f56bd579204426143be1e1eac6d
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date:   Wed Feb 8 10:56:09 2012 +0200
+
+    Switch back to former, much smaller BDB memory pool size (RhBug:752897)
+    
+    - A larger cache is beneficial in various scenarios, but triggers
+      horrible worst-case performance under memory pressure (or so my
+      current theory goes, there might be other factors too). The
+      worst-case degration is orders of magnitude bigger than the best-case
+      improvements from the larger cache and for many use-cases doesn't
+      make a whole lot difference.  We could/should tune the cache with
+      priorizing indexes and all, and perhaps dynamically select the
+      cache size but for now, the 1Mb cache size is known to "just work".
+
+diff --git a/macros.in b/macros.in
+index f835fec..6034721 100644
+--- a/macros.in
++++ b/macros.in
+@@ -535,7 +535,7 @@ print (t)\
+ #
+ 
+ # Misc BDB tuning options
+-%__dbi_other			mp_mmapsize=128Mb mp_size=64Mb
++%__dbi_other			mp_mmapsize=128Mb mp_size=1Mb
+ 
+ %_dbi_config			%{?__dbi_other}
+ 
diff --git a/rpm.spec b/rpm.spec
index 9c1b5ac..49a2276 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -21,7 +21,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: %{?snapver:0.%{snapver}.}11%{?dist}
+Release: %{?snapver:0.%{snapver}.}12%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/rpm-4.9.x/%{name}-%{srcver}.tar.bz2
@@ -46,6 +46,7 @@ Patch6: rpm-4.9.0-armhfp-logic.patch
 Patch100: rpm-4.9.x-fontattr.patch
 Patch101: rpm-4.9.x-elfattr.patch
 Patch102: rpm-4.9.1.2-perl-python-attr.patch
+Patch103: rpm-4.9.x-mpsize.patch
 
 # These are not yet upstream
 Patch301: rpm-4.6.0-niagara.patch
@@ -226,6 +227,7 @@ packages on a system.
 %patch100 -p1 -b .fontattr
 %patch101 -p1 -b .elfattr
 %patch102 -p1 -b .perl-python-attr
+%patch103 -p1 -b .mpsize
 
 %patch301 -p1 -b .niagara
 %patch302 -p1 -b .geode
@@ -455,6 +457,9 @@ exit 0
 %doc COPYING doc/librpm/html/*
 
 %changelog
+* Thu Feb 09 2012 Panu Matilainen <pmatilai@redhat.com> - 4.9.1.2-12
+- switch back to smaller BDB cache default (#752897)
+
 * Sun Jan 15 2012 Dennis Gilmore <dennis@ausil.us> - 4.9.1.2-11
 - always apply arm hfp macros, conditionally apply the logic to detect hfp