=== modified file debian/changelog --- debian/changelog 2016-03-15 20:57:12 +0000 +++ debian/changelog 2016-04-01 00:48:42 +0000 @@ -1,5 +1,6 @@ juju-mongodb3.2 (3.2.0-0ubuntu1) xenial; urgency=medium + * New upstream release (LP #1557852) * d/control: - Do not build i386 and armhf because upstream will not support 32-bit. @@ -34,26 +35,21 @@ -- Curtis C. Hovey Tue, 15 Mar 2016 14:12:07 +0000 -juju-mongodb2.6 (2.6.10-0ubuntu1~juju1) wily; urgency=medium +juju-mongodb2.6 (2.6.10-0ubuntu1) xenial; urgency=medium - * New upstream release - * d/control: renamed source and binary package to juju-mongodb2.6. + * New upstream release (LP #1557830). * Updated d/ based on 1:2.6.10-0ubuntu1 d/ - - d/p Dropped patches, included upstream: - + 0003-All-platforms-but-Windows-find-hash-in-std-tr1.patch - + 0005-ARM-support-for-ASM-operations-in-MongoDB.patch - + 0008-Use-system-libstemmer.patch - + 0011-Use-a-signed-char-to-store-BSONType-enumerations.patch - + 0001-SERVER-12064-Atomic-operations-for-gcc-non-Intel-arc.patch - + 0002-SERVER-12065-Support-ARM-and-AArch64-builds.patch - + 00git_pymongo3.patch - + no-unused-variable.patch - - d/p/*: Pulled remaining updated and new patches. - * Use system provided libyaml-cpp: - + d/control: Add libyaml-cpp-dev to BD's. - + d/rules: Enable --with-system-yaml option. + * d/control: + - Renamed source and binary package to juju-mongodb2.6. + - Install to /usr/lib/juju/mongo2.6/bin/ + - Add libyaml-cpp-dev to BD's. + * d/rules: Enable --with-system-yaml option. + * d/p + - Synced upstream patches with the mongodb 1:2.6.10-0ubuntu1 + - dropped be-port because juju 1.25 and juju-mongodb will not + support s390x and powerpc; juju2 will support these archs. - -- Curtis C. Hovey Wed, 25 Nov 2015 00:11:48 +0000 + -- Curtis C. Hovey Tue, 15 Mar 2015 17:24:48 +0000 juju-mongodb (2.4.10-0ubuntu4) wily; urgency=medium === removed file debian/patches/arm64-immediate-delete-should-wait-cursor.patch --- debian/patches/arm64-immediate-delete-should-wait-cursor.patch 2016-03-18 22:04:08 +0000 +++ debian/patches/arm64-immediate-delete-should-wait-cursor.patch 1970-01-01 00:00:00 +0000 @@ -1,24 +1,0 @@ -Description: Skip a test on arm64 that fails on xenial. - This test might be identifying a real issue on xenial and wily. - More testing is need, or may the test needs rewriting. -Author: Curtis Hovey -Forwarded: not-needed - ---- a/src/mongo/db/range_deleter_test.cpp -+++ b/src/mongo/db/range_deleter_test.cpp -@@ -153,6 +153,7 @@ - ASSERT_FALSE(env->deleteOccured()); - } - -+#if !defined(__aarch64__) - // Should not start delete if the set of cursors that were open when the - // deleteNow method is called is still open. - TEST(ImmediateDelete, ShouldWaitCursor) { -@@ -259,6 +260,7 @@ - - ASSERT_FALSE(env->deleteOccured()); - } -+#endif - - // Tests the interaction of multiple deletes queued with different states. - // Starts by adding a new delete task, waits for the worker to work on it, === added file debian/patches/fix-for-flakey-range-deleter-test.patch --- debian/patches/fix-for-flakey-range-deleter-test.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/fix-for-flakey-range-deleter-test.patch 2016-03-31 21:24:34 +0000 @@ -1,0 +1,80 @@ +Subject: [PATCH] SERVER-22066 Add more assertions to range_deleter_test +From: Kaloian Manassiev +Origin: https://jira.mongodb.org/browse/SERVER-22066 +Bug: https://github.com/mongodb/mongo/commit/b6d309a15215a9243f21eb33cc6bcb6fbca58e56.patch + +--- + src/mongo/db/range_deleter_test.cpp | 31 +++++++++++++------------------ + 1 file changed, 13 insertions(+), 18 deletions(-) + +diff --git a/src/mongo/db/range_deleter_test.cpp b/src/mongo/db/range_deleter_test.cpp +index 76c0fc6..240925c 100644 +--- a/src/mongo/db/range_deleter_test.cpp ++++ b/src/mongo/db/range_deleter_test.cpp +@@ -48,8 +48,10 @@ using std::string; + + OperationContext* const noTxn = NULL; // MockEnv doesn't need txn XXX SERVER-13931 + +-// Capped sleep interval is 640 mSec, Nyquist frequency is 1280 mSec => round up to 2 sec. +-const int MAX_IMMEDIATE_DELETE_WAIT_SECS = 2; ++// The range deleter cursor close wait interval increases exponentially from 5 milliseconds to an ++// upper bound of 500 msec. Three seconds should be enough time for changes in the cursors set to be ++// noticed. ++const Seconds MAX_IMMEDIATE_DELETE_WAIT(3); + + const mongo::repl::ReplSettings replSettings = {}; + +@@ -175,11 +177,8 @@ TEST(ImmediateDelete, ShouldWaitCursor) { + KeyRange(ns, BSON("x" << 0), BSON("x" << 10), BSON("x" << 1))); + deleterOption.waitForOpenCursors = true; + +- // VS2013 Doesn't support future, so fake it with a bool. +- stdx::packaged_task deleterTask([&] { +- deleter.deleteNow(noTxn, deleterOption, &errMsg); +- return true; +- }); ++ stdx::packaged_task deleterTask( ++ [&] { return deleter.deleteNow(noTxn, deleterOption, &errMsg); }); + stdx::future deleterFuture = deleterTask.get_future(); + stdx::thread deleterThread(std::move(deleterTask)); + +@@ -200,10 +199,10 @@ TEST(ImmediateDelete, ShouldWaitCursor) { + env->addCursorId(ns, 200); + env->removeCursorId(ns, 345); + +- ASSERT_TRUE(stdx::future_status::ready == +- deleterFuture.wait_for(stdx::chrono::seconds(MAX_IMMEDIATE_DELETE_WAIT_SECS))); +- ++ ASSERT_TRUE(stdx::future_status::ready == deleterFuture.wait_for(MAX_IMMEDIATE_DELETE_WAIT)); ++ ASSERT_TRUE(deleterFuture.get()); + ASSERT_TRUE(env->deleteOccured()); ++ + const DeletedRange deletedChunk(env->getLastDelete()); + + ASSERT_EQUALS(ns, deletedChunk.ns); +@@ -233,11 +232,8 @@ TEST(ImmediateDelete, StopWhileWaitingCursor) { + KeyRange(ns, BSON("x" << 0), BSON("x" << 10), BSON("x" << 1))); + deleterOption.waitForOpenCursors = true; + +- // VS2013 Doesn't support future, so fake it with a bool. +- stdx::packaged_task deleterTask([&] { +- deleter.deleteNow(noTxn, deleterOption, &errMsg); +- return true; +- }); ++ stdx::packaged_task deleterTask( ++ [&] { return deleter.deleteNow(noTxn, deleterOption, &errMsg); }); + stdx::future deleterFuture = deleterTask.get_future(); + stdx::thread deleterThread(std::move(deleterTask)); + +@@ -254,9 +250,8 @@ TEST(ImmediateDelete, StopWhileWaitingCursor) { + + stop_deleter_guard.Execute(); + +- ASSERT_TRUE(stdx::future_status::ready == +- deleterFuture.wait_for(stdx::chrono::seconds(MAX_IMMEDIATE_DELETE_WAIT_SECS))); +- ++ ASSERT_TRUE(stdx::future_status::ready == deleterFuture.wait_for(MAX_IMMEDIATE_DELETE_WAIT)); ++ ASSERT_FALSE(deleterFuture.get()); + ASSERT_FALSE(env->deleteOccured()); + } + \ No newline at end of file === modified file debian/patches/series --- debian/patches/series 2016-02-24 02:26:10 +0000 +++ debian/patches/series 2016-04-01 00:06:56 +0000 @@ -15,4 +15,4 @@ warn-user-if-locked-memory-limit-is-too-low.patch fix-ppc64-preprocessor-blocks.patch skip-high-mem-test.patch -arm64-immediate-delete-should-wait-cursor.patch +fix-for-flakey-range-deleter-test.patch