summaryrefslogtreecommitdiffstats
path: root/slobrok
diff options
context:
space:
mode:
authorArne Juul <arnej@verizonmedia.com>2021-06-24 08:18:23 +0000
committerArne Juul <arnej@verizonmedia.com>2021-06-24 09:42:50 +0000
commit842181e59af9b6f27062f38192d5bab8b4f810db (patch)
tree811d17894a4b7bab745993ddc4a94581a71587e2 /slobrok
parent64885b882fc37a326e7d844ea9a02cc6e3efbc17 (diff)
remove code which is useless now
Diffstat (limited to 'slobrok')
-rw-r--r--slobrok/src/vespa/slobrok/server/CMakeLists.txt1
-rw-r--r--slobrok/src/vespa/slobrok/server/sbenv.cpp2
-rw-r--r--slobrok/src/vespa/slobrok/server/sbenv.h2
-rw-r--r--slobrok/src/vespa/slobrok/server/selfcheck.cpp53
-rw-r--r--slobrok/src/vespa/slobrok/server/selfcheck.h38
5 files changed, 0 insertions, 96 deletions
diff --git a/slobrok/src/vespa/slobrok/server/CMakeLists.txt b/slobrok/src/vespa/slobrok/server/CMakeLists.txt
index a6772404ead..3221e268e8d 100644
--- a/slobrok/src/vespa/slobrok/server/CMakeLists.txt
+++ b/slobrok/src/vespa/slobrok/server/CMakeLists.txt
@@ -18,7 +18,6 @@ vespa_add_library(slobrok_slobrokserver
rpchooks.cpp
rpcmirror.cpp
sbenv.cpp
- selfcheck.cpp
slobrokserver.cpp
visible_map.cpp
metrics_producer.cpp
diff --git a/slobrok/src/vespa/slobrok/server/sbenv.cpp b/slobrok/src/vespa/slobrok/server/sbenv.cpp
index 572481a1120..525ba0c0aa7 100644
--- a/slobrok/src/vespa/slobrok/server/sbenv.cpp
+++ b/slobrok/src/vespa/slobrok/server/sbenv.cpp
@@ -2,7 +2,6 @@
#include "reconfigurable_stateserver.h"
#include "sbenv.h"
-#include "selfcheck.h"
#include "remote_check.h"
#include <vespa/vespalib/util/host_name.h>
#include <vespa/vespalib/util/exceptions.h>
@@ -107,7 +106,6 @@ SBEnv::SBEnv(const ConfigShim &shim)
_partnerList(),
_me(createSpec(_configShim.portNumber())),
_rpcHooks(*this, _rpcsrvmap, _rpcsrvmanager),
- _selfchecktask(std::make_unique<SelfCheck>(getSupervisor()->GetScheduler(), _rpcsrvmap, _rpcsrvmanager)),
_remotechecktask(std::make_unique<RemoteCheck>(getSupervisor()->GetScheduler(), _rpcsrvmap, _rpcsrvmanager, _exchanger)),
_health(),
_metrics(_rpcHooks, *_transport),
diff --git a/slobrok/src/vespa/slobrok/server/sbenv.h b/slobrok/src/vespa/slobrok/server/sbenv.h
index 3a8badb9538..1050bd1359a 100644
--- a/slobrok/src/vespa/slobrok/server/sbenv.h
+++ b/slobrok/src/vespa/slobrok/server/sbenv.h
@@ -24,7 +24,6 @@ namespace slobrok {
class NamedService;
class ManagedRpcServer;
class RPCHooks;
-class SelfCheck;
class RemoteCheck;
/**
@@ -51,7 +50,6 @@ private:
std::vector<std::string> _partnerList;
std::string _me;
RPCHooks _rpcHooks;
- std::unique_ptr<SelfCheck> _selfchecktask;
std::unique_ptr<RemoteCheck> _remotechecktask;
vespalib::SimpleHealthProducer _health;
MetricsProducer _metrics;
diff --git a/slobrok/src/vespa/slobrok/server/selfcheck.cpp b/slobrok/src/vespa/slobrok/server/selfcheck.cpp
deleted file mode 100644
index a9fab650772..00000000000
--- a/slobrok/src/vespa/slobrok/server/selfcheck.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include "selfcheck.h"
-#include "ok_state.h"
-#include "named_service.h"
-#include "rpc_server_map.h"
-#include "rpc_server_manager.h"
-#include "managed_rpc_server.h"
-#include "random.h"
-
-#include <vespa/log/log.h>
-LOG_SETUP(".selfcheck");
-
-namespace slobrok {
-
-
-SelfCheck::SelfCheck(FNET_Scheduler *sched,
- RpcServerMap& rpcsrvmap,
- RpcServerManager& rpcsrvman)
- : FNET_Task(sched),
- _rpcsrvmap(rpcsrvmap), _rpcsrvmanager(rpcsrvman)
-{
- // start within 1 second
- double seconds = randomIn(0.123, 1.000);
- LOG(debug, "selfcheck in %g seconds", seconds);
- Schedule(seconds);
-}
-
-
-SelfCheck::~SelfCheck()
-{
- Kill();
-}
-
-
-void
-SelfCheck::PerformTask()
-{
- std::vector<const NamedService *> mrpcsrvlist = _rpcsrvmap.allManaged();
-
- for (size_t i = 0; i < mrpcsrvlist.size(); ++i) {
- const NamedService *r = mrpcsrvlist[i];
- ManagedRpcServer *m = _rpcsrvmap.lookupManaged(r->getName());
- LOG_ASSERT(r == m);
- LOG(debug, "managed: %s -> %s", m->getName().c_str(), m->getSpec().c_str());
- }
- // reschedule in 1-2 seconds:
- double seconds = randomIn(0.987, 2.000);
- LOG(debug, "selfcheck AGAIN in %g seconds", seconds);
- Schedule(seconds);
-}
-
-} // namespace slobrok
diff --git a/slobrok/src/vespa/slobrok/server/selfcheck.h b/slobrok/src/vespa/slobrok/server/selfcheck.h
deleted file mode 100644
index 52eced4700b..00000000000
--- a/slobrok/src/vespa/slobrok/server/selfcheck.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#pragma once
-
-#include <vespa/fnet/task.h>
-
-namespace slobrok {
-
-class SBEnv;
-class RpcServerMap;
-class RpcServerManager;
-class ExchangeManager;
-
-/**
- * @class SelfCheck
- * @brief Periodic healthcheck task
- *
- * Checks the health of this location broker
- * and its ManagedRpcServer objects periodically.
- **/
-class SelfCheck : public FNET_Task
-{
-private:
- RpcServerMap &_rpcsrvmap;
- RpcServerManager &_rpcsrvmanager;
-
- SelfCheck(const SelfCheck &); // Not used
- SelfCheck &operator=(const SelfCheck &); // Not used
-public:
- explicit SelfCheck(FNET_Scheduler *sched,
- RpcServerMap& rpcsrvmap,
- RpcServerManager& rpcsrvman);
- ~SelfCheck();
-private:
- void PerformTask() override;
-};
-
-} // namespace slobrok
-