Revert "Continue serving search queries when in Maintenance node state [run-systemtest]"

2 files changed, 11 insertions, 96 deletions

diff --git a/searchcore/src/tests/proton/documentdb/buckethandler/buckethandler_test.cpp b/searchcore/src/tests/proton/documentdb/buckethandler/buckethandler_test.cpp
index cadfa8cd72f..29748a2010c 100644
--- a/searchcore/src/tests/proton/documentdb/buckethandler/buckethandler_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/buckethandler/buckethandler_test.cpp
@@ -140,11 +140,6 @@ struct Fixture
     setNodeUp(bool value)
     {
         _calc->setNodeUp(value);
-        _calc->setNodeMaintenance(false);
-        _handler.notifyClusterStateChanged(_calc);
-    }
-    void setNodeMaintenance(bool value) {
-        _calc->setNodeMaintenance(value);
         _handler.notifyClusterStateChanged(_calc);
     }
 };
@@ -228,7 +223,7 @@ TEST_F("require that unready bucket can be reported as active", Fixture)
 }
 
 
-TEST_F("node going down (but not into maintenance state) deactivates all buckets", Fixture)
+TEST_F("require that node being down deactivates buckets", Fixture)
 {
     f._handler.handleSetCurrentState(f._ready.bucket(2),
                                      BucketInfo::ACTIVE, f._genResult);
@@ -257,42 +252,6 @@ TEST_F("node going down (but not into maintenance state) deactivates all buckets
     EXPECT_EQUAL(true, f._bucketInfo.getInfo().isActive());
 }
 
-TEST_F("node going into maintenance state does _not_ deactivate any buckets", Fixture)
-{
-    f._handler.handleSetCurrentState(f._ready.bucket(2),
-                                     BucketInfo::ACTIVE, f._genResult);
-    f.sync();
-    f.setNodeMaintenance(true);
-    f.sync();
-    f.handleGetBucketInfo(f._ready.bucket(2));
-    EXPECT_TRUE(f._bucketInfo.getInfo().isActive());
-}
-
-TEST_F("node going from maintenance to up state deactivates all buckets", Fixture)
-{
-    f._handler.handleSetCurrentState(f._ready.bucket(2),
-                                     BucketInfo::ACTIVE, f._genResult);
-    f.sync();
-    f.setNodeMaintenance(true);
-    f.sync();
-    f.setNodeUp(true);
-    f.sync();
-    f.handleGetBucketInfo(f._ready.bucket(2));
-    EXPECT_FALSE(f._bucketInfo.getInfo().isActive());
-}
-
-TEST_F("node going from maintenance to down state deactivates all buckets", Fixture)
-{
-    f._handler.handleSetCurrentState(f._ready.bucket(2),
-                                     BucketInfo::ACTIVE, f._genResult);
-    f.sync();
-    f.setNodeMaintenance(true);
-    f.sync();
-    f.setNodeUp(false);
-    f.sync();
-    f.handleGetBucketInfo(f._ready.bucket(2));
-    EXPECT_FALSE(f._bucketInfo.getInfo().isActive());
-}
 
 TEST_MAIN()
 {
diff --git a/searchcore/src/tests/proton/matchengine/matchengine.cpp b/searchcore/src/tests/proton/matchengine/matchengine.cpp
index 34c36fd9a72..481a9f061be 100644
--- a/searchcore/src/tests/proton/matchengine/matchengine.cpp
+++ b/searchcore/src/tests/proton/matchengine/matchengine.cpp
@@ -17,7 +17,7 @@ class MySearchHandler : public ISearchHandler {
     std::string _name;
     std::string _reply;
 public:
-    explicit MySearchHandler(size_t numHits = 0) :
+    MySearchHandler(size_t numHits = 0) :
         _numHits(numHits), _name("my"), _reply("myreply")
     {}
     DocsumReply::UP getDocsums(const DocsumRequest &) override {
@@ -91,7 +91,6 @@ assertSearchReply(MatchEngine & engine, const std::string & searchDocType, size_
     LocalSearchClient client;
     engine.search(SearchRequest::Source(request), client);
     SearchReply::UP reply = client.getReply(10000);
-    ASSERT_TRUE(reply);
     return EXPECT_EQUAL(expHits, reply->hits.size());
 }
 
@@ -174,24 +173,11 @@ TEST("requireThatEmptySearchReplyIsReturnedWhenEngineIsClosed")
     LocalSearchClient client;
     SearchRequest::Source request(new SearchRequest());
     SearchReply::UP reply = engine.search(std::move(request), client);
-    ASSERT_TRUE(reply);
+    EXPECT_TRUE(reply );
     EXPECT_EQUAL(0u, reply->hits.size());
     EXPECT_EQUAL(7u, reply->getDistributionKey());
 }
 
-namespace {
-
-constexpr const char* search_interface_offline_slime_str() noexcept {
-    return "{\n"
-           "    \"status\": {\n"
-           "        \"state\": \"OFFLINE\",\n"
-           "        \"message\": \"Search interface is offline\"\n"
-           "    }\n"
-           "}\n";
-}
-
-}
-
 TEST("requireThatStateIsReported")
 {
     MatchEngine engine(1, 1, 7);
@@ -199,44 +185,14 @@ TEST("requireThatStateIsReported")
     Slime slime;
     SlimeInserter inserter(slime);
     engine.get_state(inserter, false);
-    EXPECT_EQUAL(search_interface_offline_slime_str(),
-                 slime.toString());
-}
-
-TEST("searches are executed when node is in maintenance mode")
-{
-    MatchEngine engine(1, 1, 7);
-    engine.setNodeMaintenance(true);
-    engine.putSearchHandler(DocTypeName("foo"), std::make_shared<MySearchHandler>(3));
-    EXPECT_TRUE(assertSearchReply(engine, "foo", 3));
-}
-
-TEST("setNodeMaintenance(true) implies setNodeUp(false)")
-{
-    MatchEngine engine(1, 1, 7);
-    engine.setNodeUp(true);
-    engine.setNodeMaintenance(true);
-    EXPECT_FALSE(engine.isOnline());
-}
-
-TEST("setNodeMaintenance(false) does not imply setNodeUp(false)")
-{
-    MatchEngine engine(1, 1, 7);
-    engine.setNodeUp(true);
-    engine.setNodeMaintenance(false);
-    EXPECT_TRUE(engine.isOnline());
-}
-
-TEST("search interface is reported as offline when node is in maintenance mode")
-{
-    MatchEngine engine(1, 1, 7);
-    engine.setNodeMaintenance(true);
-
-    Slime slime;
-    SlimeInserter inserter(slime);
-    engine.get_state(inserter, false);
-    EXPECT_EQUAL(search_interface_offline_slime_str(),
-                 slime.toString());
+    EXPECT_EQUAL(
+            "{\n"
+            "    \"status\": {\n"
+            "        \"state\": \"OFFLINE\",\n"
+            "        \"message\": \"Search interface is offline\"\n"
+            "    }\n"
+            "}\n",
+            slime.toString());
 }
 
 TEST_MAIN() { TEST_RUN_ALL(); }