MB-20307: Re-enable dcp ep_dcp_dead_conn_count

The call to collect this stat was dropped in
a recent merge commit. This commit adds it back.

Change-Id: I06d1d18cb4479edb2a74d899d4c3a8089a0c4656
Reviewed-on: http://review.couchbase.org/66284
Tested-by: buildbot <build@couchbase.com>
Reviewed-by: Will Gardner <will.gardner@couchbase.com>
Well-Formed: buildbot <build@couchbase.com>

diff --git a/src/connmap.cc b/src/connmap.cc
index a06dd81..a19bad1 100644 (file)
--- a/src/connmap.cc
+++ b/src/connmap.cc
@@ -1298,3 +1298,9 @@ void DcpConnMap::updateMaxActiveSnoozingBackfills(size_t maxDataSize)
     LOG(EXTENSION_LOG_DEBUG, "Max active snoozing backfills set to %d",
         maxActiveSnoozingBackfills);
 }
+
+void DcpConnMap::addStats(ADD_STAT add_stat, const void *c) {
+    LockHolder lh(connsLock);
+    add_casted_stat("ep_dcp_dead_conn_count", deadConnections.size(),
+                    add_stat, c);
+}

diff --git a/src/connmap.h b/src/connmap.h
index bc72555..1962d03 100644 (file)
--- a/src/connmap.h
+++ b/src/connmap.h
@@ -519,6 +519,8 @@ public:
      */
     void consumerBatchSizeConfigChanged(size_t newValue);
 
+    void addStats(ADD_STAT add_stat, const void *c);
+
 protected:
 
     bool isPassiveStreamConnected_UNLOCKED(uint16_t vbucket);

diff --git a/src/ep_engine.cc b/src/ep_engine.cc
index 3b7328d..921a33b 100644 (file)
--- a/src/ep_engine.cc
+++ b/src/ep_engine.cc
@@ -4082,6 +4082,7 @@ ENGINE_ERROR_CODE EventuallyPersistentEngine::doDcpStats(const void *cookie,
     add_casted_stat("ep_dcp_max_running_backfills",
                     dcpConnMap_->getMaxActiveSnoozingBackfills(), add_stat, cookie);
 
+    dcpConnMap_->addStats(add_stat, cookie);
     return ENGINE_SUCCESS;
 }