summaryrefslogtreecommitdiffstats
path: root/searchlib
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2018-01-08 15:20:04 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2018-01-08 15:20:04 +0100
commite68dd5f453440e7f4c7aeec795cba489da5079c3 (patch)
tree2660fdaa4ff04c136669c19d3bbd05d8f4f93f14 /searchlib
parent26891948fecdea2eda47b6eff648c59872aecb0a (diff)
Do explicit shutdown of executors early.
Diffstat (limited to 'searchlib')
-rw-r--r--searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp4
-rw-r--r--searchlib/src/vespa/searchlib/transactionlog/translogserver.h3
2 files changed, 5 insertions, 2 deletions
diff --git a/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp b/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp
index e793aafd38f..4c3c5609a93 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp
@@ -147,6 +147,10 @@ TransLogServer::~TransLogServer()
{
stop();
join();
+ _commitExecutor.shutdown();
+ _commitExecutor.sync();
+ _sessionExecutor.shutdown();
+ _sessionExecutor.sync();
_supervisor->ShutDown(true);
}
diff --git a/searchlib/src/vespa/searchlib/transactionlog/translogserver.h b/searchlib/src/vespa/searchlib/transactionlog/translogserver.h
index c12e37dd1c8..d78d3d39887 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/translogserver.h
+++ b/searchlib/src/vespa/searchlib/transactionlog/translogserver.h
@@ -28,12 +28,11 @@ public:
const common::FileHeaderContext &fileHeaderContext, uint64_t domainPartSize);
TransLogServer(const vespalib::string &name, int listenPort, const vespalib::string &baseDir,
const common::FileHeaderContext &fileHeaderContext);
- virtual ~TransLogServer();
+ ~TransLogServer() override;
DomainStats getDomainStats() const;
void commit(const vespalib::string & domainName, const Packet & packet, DoneCallback done) override;
-
class Session
{
bool _down;