From eece2fd58f77c57e5d923ff753e6e9fc39f4f449 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Wed, 7 Feb 2018 11:01:48 +0000 Subject: Do not reorder TLS as it requires chdir to be done first. --- searchcore/src/vespa/searchcore/proton/server/proton.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'searchcore/src') diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp index c5baca74924..533d0737ca2 100644 --- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp @@ -236,7 +236,6 @@ Proton::init(const BootstrapConfig::SP & configSnapshot) diskMemUsageSamplerConfig(protonConfig, hwInfo)); _tls = std::make_unique(_configUri.createWithNewId(protonConfig.tlsconfigid), _fileHeaderContext); - _tls->start(); _metricsEngine->addMetricsHook(_metricsHook); _fileHeaderContext.setClusterName(protonConfig.clustername, protonConfig.basedir); _matchEngine.reset(new MatchEngine(protonConfig.numsearcherthreads, @@ -263,6 +262,7 @@ Proton::init(const BootstrapConfig::SP & configSnapshot) } vespalib::mkdir(protonConfig.basedir + "/documents", true); vespalib::chdir(protonConfig.basedir); + _tls->start(); _flushEngine.reset(new FlushEngine(std::make_shared(_tls->getTransLogServer()), strategy, flush.maxconcurrent, flush.idleinterval*1000)); _fs4Server.reset(new TransportServer(*_matchEngine, *_summaryEngine, *this, protonConfig.ptport, TransportServer::DEBUG_ALL)); -- cgit v1.2.3