[BP] MB-20585: Fix memory leak

Only one of the MB-20585 fixes needs backporting and
a fix to two tests that came from watson->master merge
commit.

Orginal MB commit to master is a288f6c6
Test fix came from 0f532bce

Change-Id: I200706997df2d24a7629282e119b0ab8af2c4872
Reviewed-on: http://review.couchbase.org/68936
Tested-by: buildbot <build@couchbase.com>
Reviewed-by: Dave Rigby <daver@couchbase.com>

diff --git a/src/connmap.cc b/src/connmap.cc
index 457f2fd..82a667b 100644 (file)
--- a/src/connmap.cc
+++ b/src/connmap.cc
@@ -1085,6 +1085,7 @@ void DcpConnMap::shutdownAllConnections() {
 
     if (connNotifier_ != NULL) {
         connNotifier_->stop();
+        manageConnections();
     }
 
     // Take a copy of the connection map (under lock), then using the

diff --git a/tests/module_tests/dcp_test.cc b/tests/module_tests/dcp_test.cc
index 53a9e4b..c5eb313 100644 (file)
--- a/tests/module_tests/dcp_test.cc
+++ b/tests/module_tests/dcp_test.cc
@@ -659,7 +659,9 @@ TEST_F(ConnectionTest, test_mb20716_connmap_notify_on_delete) {
     // 1. Simulate a bucket deletion.
     connMap.shutdownAllConnections();
 
-    EXPECT_EQ(1, notify_count)
+    // Can also get a second notify as part of manageConnections being called
+    // in shutdownAllConnections().
+    EXPECT_GE(notify_count, 1)
         << "expected one notify after shutting down all connections";
 
     // Restore notify_io_complete callback.
@@ -714,7 +716,7 @@ TEST_F(ConnectionTest, test_mb20716_connmap_notify_on_delete_consumer) {
     // 2. Simulate a bucket deletion.
     connMap.shutdownAllConnections();
 
-    EXPECT_EQ(1, notify_count)
+    EXPECT_GE(notify_count, 1)
         << "expected one notify after shutting down all connections";
 
     // Restore notify_io_complete callback.