Merge pull request #7528 from vespa-engine/toregge/fix-summary-thread-observation

Fix mixup of summary thread observer and index thread observer.

3 files changed, 8 insertions, 8 deletions

diff --git a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
index d21e5abe30b..c11bea14863 100644
--- a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
@@ -1144,7 +1144,7 @@ TEST_F("require that compactLidSpace() propagates to document meta store and doc
     f.compactLidSpaceAndWait(2);
     // performIndexForceCommit in index thread, then completion callback
     // in master thread.
-    EXPECT_TRUE(assertThreadObserver(7, 4, 4, f.writeServiceObserver()));
+    EXPECT_TRUE(assertThreadObserver(7, 4, 3, f.writeServiceObserver()));
     EXPECT_EQUAL(2u, f.metaStoreObserver()._compactLidSpaceLidLimit);
     EXPECT_EQUAL(2u, f.getDocumentStore()._compactLidSpaceLidLimit);
     EXPECT_EQUAL(1u, f.metaStoreObserver()._holdUnblockShrinkLidSpaceCnt);
diff --git a/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/lidreusedelayer_test.cpp b/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/lidreusedelayer_test.cpp
index df411ea0346..89764a562e6 100644
--- a/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/lidreusedelayer_test.cpp
+++ b/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/lidreusedelayer_test.cpp
@@ -254,7 +254,7 @@ TEST_F("require that single lid is delayed", Fixture)
     EXPECT_TRUE(f.delayReuse(4));
     f.scheduleDelayReuseLid(4);
     EXPECT_TRUE(f._store.assertWork(1, 0, 1));
-    EXPECT_TRUE(assertThreadObserver(4, 1, 1, f._writeService));
+    EXPECT_TRUE(assertThreadObserver(4, 1, 0, f._writeService));
 }
 
 
@@ -265,7 +265,7 @@ TEST_F("require that lid vector is delayed", Fixture)
     EXPECT_TRUE(f.delayReuse({ 5, 6, 7}));
     f.scheduleDelayReuseLids({ 5, 6, 7});
     EXPECT_TRUE(f._store.assertWork(0, 1, 3));
-    EXPECT_TRUE(assertThreadObserver(4, 1, 1, f._writeService));
+    EXPECT_TRUE(assertThreadObserver(4, 1, 0, f._writeService));
 }
 
 
@@ -280,11 +280,11 @@ TEST_F("require that reuse can be batched", Fixture)
     EXPECT_TRUE(assertThreadObserver(4, 0, 0, f._writeService));
     f.commit();
     EXPECT_TRUE(f._store.assertWork(0, 1, 4));
-    EXPECT_TRUE(assertThreadObserver(6, 1, 1, f._writeService));
+    EXPECT_TRUE(assertThreadObserver(6, 1, 0, f._writeService));
     EXPECT_FALSE(f.delayReuse(8));
     EXPECT_FALSE(f.delayReuse({ 9, 10}));
     EXPECT_TRUE(f._store.assertWork(0, 1, 4));
-    EXPECT_TRUE(assertThreadObserver(8, 1, 1, f._writeService));
+    EXPECT_TRUE(assertThreadObserver(8, 1, 0, f._writeService));
 }
 
 
@@ -299,11 +299,11 @@ TEST_F("require that single element array is optimized", Fixture)
     f.commit();
     f.setImmediateCommit(true);
     EXPECT_TRUE(f._store.assertWork(1, 0, 1));
-    EXPECT_TRUE(assertThreadObserver(6, 1, 1, f._writeService));
+    EXPECT_TRUE(assertThreadObserver(6, 1, 0, f._writeService));
     EXPECT_TRUE(f.delayReuse({ 8}));
     f.scheduleDelayReuseLids({ 8});
     EXPECT_TRUE(f._store.assertWork(2, 0, 2));
-    EXPECT_TRUE(assertThreadObserver(9, 2, 2, f._writeService));
+    EXPECT_TRUE(assertThreadObserver(9, 2, 0, f._writeService));
 }
 
 
diff --git a/searchcore/src/vespa/searchcore/proton/test/threading_service_observer.h b/searchcore/src/vespa/searchcore/proton/test/threading_service_observer.h
index 44dc405bf93..ac6b44dea5f 100644
--- a/searchcore/src/vespa/searchcore/proton/test/threading_service_observer.h
+++ b/searchcore/src/vespa/searchcore/proton/test/threading_service_observer.h
@@ -39,7 +39,7 @@ public:
         return _index;
     }
     const ThreadServiceObserver &summaryObserver() const {
-        return _index;
+        return _summary;
     }
     const search::SequencedTaskExecutorObserver &indexFieldInverterObserver() const {
         return _indexFieldInverter;