[Pkg-mongodb-maintainers] [pkg-mongodb] 02/04: Set MMAPv1 as the default storage engine on i386

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch master
in repository pkg-mongodb.

commit c76adefa87432cd17b8a198beca54716f8c9c2ea
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Thu Dec 15 18:03:41 2016 +0200

    Set MMAPv1 as the default storage engine on i386
---
 debian/patches/series             |  1 +
 debian/patches/use-mmapv1-on-i386 | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index b23e471..a264260 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ fix-gcc-6-ftbfs.patch
 fix-boost-1.60-build.patch
 fix-boost-1.62-build.patch
 CVE-2016-6494.patch
+use-mmapv1-on-i386
diff --git a/debian/patches/use-mmapv1-on-i386 b/debian/patches/use-mmapv1-on-i386
new file mode 100644
index 0000000..c55e069
--- /dev/null
+++ b/debian/patches/use-mmapv1-on-i386
@@ -0,0 +1,34 @@
+Author: Apollon Oikonomopoulos <apoikos at debian.org>
+Description: Use MMAPv1 by default on i386
+ Since wiredTiger does not build on i386, make sure mongod won't try to use it
+ by default.
+Last-Update: 2016-12-15
+Forwarded: no
+--- a/src/mongo/db/storage/storage_options.h
++++ b/src/mongo/db/storage/storage_options.h
+@@ -51,7 +51,11 @@
+     static const char* kDefaultConfigDbPath;
+ 
+     StorageGlobalParams()
++#if defined(__i386__)
++        : engine("mmapv1"),
++#else
+         : engine("wiredTiger"),
++#endif
+           engineSetByUser(false),
+           dbpath(kDefaultDbPath),
+           upgrade(false),
+--- a/src/mongo/dbtests/framework_options.cpp
++++ b/src/mongo/dbtests/framework_options.cpp
+@@ -92,7 +92,11 @@
+ 
+     options->addOptionChaining(
+                  "storage.engine", "storageEngine", moe::String, "what storage engine to use")
++#if defined(__i386__)
++        .setDefault(moe::Value(std::string("mmapv1")));
++#else
+         .setDefault(moe::Value(std::string("wiredTiger")));
++#endif
+ 
+     options->addOptionChaining("suites", "suites", moe::StringVector, "test suites to run")
+         .hidden()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mongodb/pkg-mongodb.git