Merge ~ahasenack/ubuntu/+source/mongodb:bionic-mongo-restore into ubuntu/+source/mongodb:ubuntu/bionic-devel

[Andreas Hasenack]

Bug has the SRU template filled out, including testing instructions. I ran them myself and confirmed this fixes the issue as described.

[Christian Ehrhardt  (paelzer)]

I did re-check the tests and updated the bug status a bit to be correct (needs Bionci&Cosmic bug Disco is done).

[Christian Ehrhardt  (paelzer)]

Versions in B/C are identical, so it will be nearly the same aside the version in the changelog, but just FZI a matching cosmic upload will be needed as well.

[Christian Ehrhardt  (paelzer)]

I found no PPA associated to test the fix myself, but the change is straight forward and looks correct to me.
You mentioned that you tested it and I trust that as well.

Nothing to complain, except the missing Cosmic upload.

P.S. about testing, do the self tests run at build time? have you tried to add just the test but not the fix if this would reliably catch and stop it at build time?

review: Approve

[Andreas Hasenack (ahasenack)]

Sorry, the PPA is https://launchpad.net/~ahasenack/+archive/ubuntu/mongodb-restore-server-36951

Cosmic is an FTBFS (it was already, since the cosmic release). I'm working on that now.

[Andreas Hasenack (ahasenack)]

The tests do run at build time. I haven't experimented with them, as this package takes a long time to build.

[Christian Ehrhardt  (paelzer)]

Ack to the version update

[Andreas Hasenack (ahasenack)]

Thanks, tagged and uploaded:

$ git push pkg upload/1%3.6.3-0ubuntu1.1
Enumerating objects: 20, done.
Counting objects: 100% (20/20), done.
Delta compression using up to 4 threads
Compressing objects: 100% (15/15), done.
Writing objects: 100% (15/15), 3.50 KiB | 298.00 KiB/s, done.
Total 15 (delta 10), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/mongodb
 * [new tag] upload/1%3.6.3-0ubuntu1.1 -> upload/1%3.6.3-0ubuntu1.1

$ dput ubuntu ../mongodb_3.6.3-0ubuntu1.1_source.changes
Checking signature on .changes
gpg: ../mongodb_3.6.3-0ubuntu1.1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../mongodb_3.6.3-0ubuntu1.1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading mongodb_3.6.3-0ubuntu1.1.dsc: done.
  Uploading mongodb_3.6.3-0ubuntu1.1.debian.tar.xz: done.
  Uploading mongodb_3.6.3-0ubuntu1.1_source.buildinfo: done.
  Uploading mongodb_3.6.3-0ubuntu1.1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index b58db7c..81b72e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mongodb (1:3.6.3-0ubuntu1.1) bionic; urgency=medium
+
+  * d/p/SERVER-36951-applyOps-createIndexes-without-uuid.patch: fix restoring
+    of a database backup when applyOps has a createIndexes command without a
+    UUID. (LP: #1821391)
+
+ -- Andreas Hasenack <[e-mail]>  Fri, 22 Mar 2019 16:11:02 -0300
+
 mongodb (1:3.6.3-0ubuntu1) bionic; urgency=medium
 
   * New upstream release (LP: #1761807).
diff --git a/debian/patches/SERVER-36951-applyOps-createIndexes-without-uuid.patch b/debian/patches/SERVER-36951-applyOps-createIndexes-without-uuid.patch
new file mode 100644
index 0000000..7c9ee38
--- /dev/null
+++ b/debian/patches/SERVER-36951-applyOps-createIndexes-without-uuid.patch
@@ -0,0 +1,116 @@
+From 19e9da9cdc76f69076c0212dcd6208e05ea71d7a Mon Sep 17 00:00:00 2001
+From: Dianna Hohensee <[e-mail]>
+Date: Tue, 18 Sep 2018 11:30:49 -0400
+Subject: [PATCH] SERVER-36951 a createIndexes operation inside applyOps is not
+ required to have a UUID.
+
+(cherry picked from commit 0d0ba866052fd2b9ceaaa66c2b725a02822b102d)
+
+Bug: https://jira.mongodb.org/browse/SERVER-36951
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mongodb/+bug/1821391
+Origin: https://github.com/mongodb/mongo/commit/19e9da9cdc76f69076c0212dcd6208e05ea71d7a
+Last-Update: 2019-03-22
+
+---
+ jstests/replsets/apply_ops_create_indexes.js | 46 +++++++++++++++-----
+ src/mongo/db/repl/oplog.cpp                  |  2 +-
+ 2 files changed, 37 insertions(+), 11 deletions(-)
+
+diff --git a/jstests/replsets/apply_ops_create_indexes.js b/jstests/replsets/apply_ops_create_indexes.js
+index 4fe813b5ed4..1aba4e710b9 100644
+--- a/jstests/replsets/apply_ops_create_indexes.js
++++ b/jstests/replsets/apply_ops_create_indexes.js
+@@ -1,6 +1,6 @@
+-/* This test ensures that indexes created by running applyOps are successfully replicated (see
+- * SERVER-31435). Both insertion into system.indexes and createIndexes style oplog entries are
+- * passed to applyOps here.
++/**
++ * This test ensures that indexes created by running applyOps are both successful and replicated
++ * correctly (see SERVER-31435).
+  */
+ (function() {
+     "use strict";
+@@ -9,8 +9,18 @@
+         let res = testDB.runCommand(cmd);
+         assert.commandWorked(res, "could not run " + tojson(cmd));
+         let indexes = new DBCommandCursor(testDB, res).toArray();
++
+         assert.eq(indexes.length, expectedNumIndexes);
+-        assert.eq(indexes[expectedNumIndexes - 1].name, indexName);
++
++        let foundIndex = false;
++        for (let i = 0; i < indexes.length; ++i) {
++            if (indexes[i].name == indexName) {
++                foundIndex = true;
++            }
++        }
++        assert(foundIndex,
++               "did not find the index '" + indexName + "' amongst the collection indexes: " +
++                   tojson(indexes));
+     };
+ 
+     let ensureOplogEntryExists = function(localDB, indexName) {
+@@ -46,28 +56,44 @@
+     // Create an index via the applyOps command with the createIndexes command format and make sure
+     // it exists.
+     let uuid = primaryTestDB.getCollectionInfos()[0].info.uuid;
+-    let cmdFormatIndexName = "a_1";
++    let cmdFormatIndexNameA = "a_1";
+     cmd = {
+         applyOps: [{
+             op: "c",
+             ns: dbName + "." + collName,
+             ui: uuid,
+-            o: {createIndexes: collName, v: 2, key: {a: 1}, name: cmdFormatIndexName}
++            o: {createIndexes: collName, v: 2, key: {a: 1}, name: cmdFormatIndexNameA}
++        }]
++    };
++    res = primaryTestDB.runCommand(cmd);
++    assert.commandWorked(res, "could not run " + tojson(cmd));
++    rst.awaitReplication();
++    ensureIndexExists(primaryTestDB, collName, cmdFormatIndexNameA, 2);
++
++    // Same as directly above, but ensure that applyOps createIndexes can work without a uuid.
++    let cmdFormatIndexNameB = "b_1";
++    cmd = {
++        applyOps: [{
++            op: "c",
++            ns: dbName + "." + collName,
++            o: {createIndexes: collName, v: 2, key: {b: 1}, name: cmdFormatIndexNameB}
+         }]
+     };
+     res = primaryTestDB.runCommand(cmd);
+     assert.commandWorked(res, "could not run " + tojson(cmd));
+     rst.awaitReplication();
+-    ensureIndexExists(primaryTestDB, collName, cmdFormatIndexName, 2);
++    ensureIndexExists(primaryTestDB, collName, cmdFormatIndexNameB, 3);
+ 
+     let localDB = rst.getPrimary().getDB("local");
+-    ensureOplogEntryExists(localDB, cmdFormatIndexName);
++    ensureOplogEntryExists(localDB, cmdFormatIndexNameA);
++    ensureOplogEntryExists(localDB, cmdFormatIndexNameB);
+ 
+-    // Make sure the index was replicated to the secondaries.
++    // Make sure the indexes were replicated to the secondaries.
+     let secondaries = rst.getSecondaries();
+     for (let j = 0; j < secondaries.length; j++) {
+         let secondaryTestDB = secondaries[j].getDB(dbName);
+-        ensureIndexExists(secondaryTestDB, collName, cmdFormatIndexName, 2);
++        ensureIndexExists(secondaryTestDB, collName, cmdFormatIndexNameA, 3);
++        ensureIndexExists(secondaryTestDB, collName, cmdFormatIndexNameB, 3);
+     }
+ 
+     // Create an index by inserting into system.indexes in applyOps.
+diff --git a/src/mongo/db/repl/oplog.cpp b/src/mongo/db/repl/oplog.cpp
+index db55e1560e4..076d8253059 100644
+--- a/src/mongo/db/repl/oplog.cpp
++++ b/src/mongo/db/repl/oplog.cpp
+@@ -789,7 +789,7 @@ std::map<std::string, ApplyOpMetadata> opsMap = {
+          BSONObj& cmd,
+          const OpTime& opTime,
+          OplogApplication::Mode mode) -> Status {
+-          const NamespaceString nss(parseUUID(opCtx, ui));
++          const NamespaceString nss(parseUUIDorNs(opCtx, ns, ui, cmd));
+           BSONElement first = cmd.firstElement();
+           invariant(first.fieldNameStringData() == "createIndexes");
+           uassert(ErrorCodes::InvalidNamespace,
diff --git a/debian/patches/series b/debian/patches/series
index 5d72f11..63ec92e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ fix-ftbfs-with-gcc-7.patch
 fix-altivec-endianness.patch
 SERVER-34117-skip-dns-tests.patch
 strip-test-binaries.patch
+SERVER-36951-applyOps-createIndexes-without-uuid.patch