MB-19033 Allow connections of the same name

It was thought that connections would not exist
in the connection map with the same name.

However the view code does create connections of
the same name.  As we index on the connection object
(cookie) as opposed to the name, we can relax the
constraints to allow connections of the same name.

Change-Id: I721c4d409d7f02119af534cbf1d887d9e65246c3
Reviewed-on: http://review.couchbase.org/62361
Reviewed-by: Chiyoung Seo <[email protected]>
Tested-by: buildbot <[email protected]>

Author: owend74

src/connmap.cc

@@ -935,15 +935,6 @@ DcpConsumer *DcpConnMap::newConsumer(const void* cookie,
     std::string conn_name("eq_dcpq:");
     conn_name.append(name);
 
-    for (const auto conn: all) {
-        if (conn->getName() == conn_name) {
-            LOG(EXTENSION_LOG_WARNING,
-                "Failed to create Dcp Consumer because connection of the "
-                "same name (%s) already exists", conn_name.c_str());
-            return nullptr;
-        }
-    }
-
     if (map_.count(cookie) != 0) {
         LOG(EXTENSION_LOG_WARNING,
             "Failed to create Dcp Consumer because connection "
@@ -1000,15 +991,6 @@ DcpProducer *DcpConnMap::newProducer(const void* cookie,
     std::string conn_name("eq_dcpq:");
     conn_name.append(name);
 
-    for (const auto conn: all) {
-        if (conn->getName() == conn_name) {
-            LOG(EXTENSION_LOG_WARNING,
-                "Failed to create Dcp Producer because connection of the "
-                "same name (%s) already exists", conn_name.c_str());
-            return nullptr;
-        }
-    }
-
     if (map_.count(cookie) != 0) {
         LOG(EXTENSION_LOG_WARNING,
             "Failed to create Dcp Producer because connection "

tests/module_tests/dcp_test.cc

@@ -351,14 +351,16 @@ TEST_F(ConnectionTest, test_mb17042_duplicate_name_producer_connections) {
     struct mock_connstruct* cookie2 = (struct mock_connstruct*)create_mock_cookie();
     // Create a new Dcp producer
     dcp_producer_t producer = connMap.newProducer(cookie1, "test_producer",
-                                                   /*notifyOnly*/false);
+                                                  /*notifyOnly*/false);
+    EXPECT_NE(0, (int)producer) << "producer is null";
 
     // Create a duplicate Dcp producer
     dcp_producer_t duplicateproducer = connMap.newProducer(cookie2, "test_producer",
-                                                    /*notifyOnly*/false);
-    EXPECT_EQ(0, (int)duplicateproducer) << "duplicateproducer is not null";
+                                                           /*notifyOnly*/false);
+    EXPECT_NE(0, (int)duplicateproducer) << "duplicateproducer is null";
 
     producer.reset();
+    duplicateproducer.reset();
     delete cookie1;
     delete cookie2;
 }
@@ -370,12 +372,14 @@ TEST_F(ConnectionTest, test_mb17042_duplicate_name_consumer_connections) {
     struct mock_connstruct* cookie2 = (struct mock_connstruct*)create_mock_cookie();
     // Create a new Dcp consumer
     dcp_consumer_t consumer = connMap.newConsumer(cookie1, "test_consumer");
+    EXPECT_NE(0, (int)consumer) << "consumer is null";
 
     // Create a duplicate Dcp consumer
     dcp_consumer_t duplicateconsumer = connMap.newConsumer(cookie2, "test_consumer");
-    EXPECT_EQ(0, (int)duplicateconsumer) << "duplicateconsumer is not null";
+    EXPECT_NE(0, (int)duplicateconsumer) << "duplicateconsumer is null";
 
     consumer.reset();
+    duplicateconsumer.reset();
     delete cookie1;
     delete cookie2;
 }