Migrate metric for number of documents in memory index.

3 files changed, 6 insertions, 2 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/metrics/documentdb_tagged_metrics.cpp b/searchcore/src/vespa/searchcore/proton/metrics/documentdb_tagged_metrics.cpp
index 661b5e34f34..f3930c58449 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/documentdb_tagged_metrics.cpp
+++ b/searchcore/src/vespa/searchcore/proton/metrics/documentdb_tagged_metrics.cpp
@@ -96,8 +96,10 @@ DocumentDBTaggedMetrics::AttributeMetrics::ResourceUsageMetrics::~ResourceUsageM
 DocumentDBTaggedMetrics::IndexMetrics::IndexMetrics(MetricSet *parent)
     : MetricSet("index", "", "Index metrics (memory and disk) for this document db", parent),
       diskUsage("disk_usage", "", "Disk space usage in bytes", this),
-      memoryUsage(this)
-{ }
+      memoryUsage(this),
+      docsInMemory("docs_in_memory", "", "Number of documents in memory index", this)
+{
+}
 
 DocumentDBTaggedMetrics::IndexMetrics::~IndexMetrics() { }
 
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/documentdb_tagged_metrics.h b/searchcore/src/vespa/searchcore/proton/metrics/documentdb_tagged_metrics.h
index 952fb0304f5..b4364673aee 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/documentdb_tagged_metrics.h
+++ b/searchcore/src/vespa/searchcore/proton/metrics/documentdb_tagged_metrics.h
@@ -101,6 +101,7 @@ struct DocumentDBTaggedMetrics : metrics::MetricSet
     {
         metrics::LongValueMetric diskUsage;
         MemoryUsageMetrics memoryUsage;
+        metrics::LongValueMetric docsInMemory;
 
         IndexMetrics(metrics::MetricSet *parent);
         ~IndexMetrics();
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
index c974f812acc..ed5c7ca89fc 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
@@ -1018,6 +1018,7 @@ updateIndexMetrics(DocumentDBMetricsCollection &metrics, const search::Searchabl
     DocumentDBTaggedMetrics::IndexMetrics &indexMetrics = metrics.getTaggedMetrics().index;
     indexMetrics.diskUsage.set(stats.sizeOnDisk());
     indexMetrics.memoryUsage.update(stats.memoryUsage());
+    indexMetrics.docsInMemory.set(stats.docsInMemory());
 
     LegacyDocumentDBMetrics::IndexMetrics &legacyIndexMetrics = metrics.getLegacyMetrics().index;
     legacyIndexMetrics.memoryUsage.set(stats.memoryUsage().allocatedBytes());