1 files changed, 45 insertions, 0 deletions
diff --git a/storage/src/tests/distributor/btree_bucket_database_test.cpp b/storage/src/tests/distributor/btree_bucket_database_test.cpp
index c253a758f98..43d74ca2fb5 100644
--- a/storage/src/tests/distributor/btree_bucket_database_test.cpp
+++ b/storage/src/tests/distributor/btree_bucket_database_test.cpp
@@ -2,11 +2,56 @@
 
 #include <vespa/storage/bucketdb/btree_bucket_database.h>
 #include <tests/distributor/bucketdatabasetest.h>
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+using namespace ::testing;
 
 namespace storage::distributor {
 
 INSTANTIATE_TEST_CASE_P(BTreeDatabase, BucketDatabaseTest,
                         ::testing::Values(std::make_shared<BTreeBucketDatabase>()));
 
+using document::BucketId;
+
+namespace {
+
+BucketCopy BC(uint32_t node_idx, uint32_t state) {
+    api::BucketInfo info(0x123, state, state);
+    return BucketCopy(0, node_idx, info);
+}
+
+
+BucketInfo BI(uint32_t node_idx, uint32_t state) {
+    BucketInfo bi;
+    bi.addNode(BC(node_idx, state), toVector<uint16_t>(0));
+    return bi;
+}
+
+}
+
+struct BTreeReadGuardTest : Test {
+    BTreeBucketDatabase _db;
+};
+
+TEST_F(BTreeReadGuardTest, guard_does_not_observe_new_entries) {
+    auto guard = _db.acquire_read_guard();
+    _db.update(BucketDatabase::Entry(BucketId(16, 16), BI(1, 1234)));
+    std::vector<BucketDatabase::Entry> entries;
+    guard->find_parents_and_self(BucketId(16, 16), entries);
+    EXPECT_EQ(entries.size(), 0U);
+}
+
+TEST_F(BTreeReadGuardTest, guard_observes_entries_alive_at_acquire_time) {
+    BucketId bucket(16, 16);
+    _db.update(BucketDatabase::Entry(bucket, BI(1, 1234)));
+    auto guard = _db.acquire_read_guard();
+    _db.remove(bucket);
+    std::vector<BucketDatabase::Entry> entries;
+    guard->find_parents_and_self(bucket, entries);
+    ASSERT_EQ(entries.size(), 1U);
+    EXPECT_EQ(entries[0].getBucketInfo(), BI(1, 1234));
+}
+
 }