From 5eaaf4252fb2b4f1f7f69499ce17acefd0e3b949 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Fri, 12 Jan 2018 14:02:44 +0100 Subject: 10ms, should not be 1ms. --- .../searchlib/transactionlog/translogserver.cpp | 53 ++++++++++++++-------- 1 file changed, 35 insertions(+), 18 deletions(-) (limited to 'searchlib') diff --git a/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp b/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp index f724f5035c8..71b5b85c20f 100644 --- a/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp +++ b/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include LOG_SETUP(".transactionlog.server"); @@ -76,7 +77,7 @@ TransLogServer::TransLogServer(const vespalib::string &name, int listenPort, con const FileHeaderContext &fileHeaderContext) : TransLogServer(name, listenPort, baseDir, fileHeaderContext, DomainConfig().setEncoding(Encoding(Encoding::xxh64, Encoding::Compression::none)) - .setPartSizeLimit(0x10000000).setChunkSizeLimit(0x40000).setChunkAgeLimit( 1ms)) + .setPartSizeLimit(0x10000000).setChunkSizeLimit(0x40000).setChunkAgeLimit( 100us)) {} TransLogServer::TransLogServer(const vespalib::string &name, int listenPort, const vespalib::string &baseDir, @@ -125,7 +126,7 @@ TransLogServer::TransLogServer(const vespalib::string &name, int listenPort, con listenOk = true; } else { LOG(warning, "Failed listening at port %s trying for %d seconds more.", listenSpec, i); - FastOS_Thread::Sleep(1000); + std::this_thread::sleep_for(1s); } } if ( ! listenOk ) { @@ -151,14 +152,16 @@ TransLogServer::~TransLogServer() _supervisor->ShutDown(true); } -bool TransLogServer::onStop() +bool +TransLogServer::onStop() { LOG(info, "Stopping TLS"); _reqQ.push(NULL); return true; } -void TransLogServer::run() +void +TransLogServer::run() { FRT_RPCRequest *req(NULL); bool hasPacket(false); @@ -201,7 +204,8 @@ void TransLogServer::run() LOG(info, "TLS Stopped"); } -void TransLogServer::logMetric() const +void +TransLogServer::logMetric() const { Guard domainGuard(_lock); for (DomainList::const_iterator it(_domains.begin()), mt(_domains.end()); it != mt; it++) { @@ -257,7 +261,8 @@ TransLogServer::findDomain(const stringref &domainName) return domain; } -void TransLogServer::exportRPC(FRT_Supervisor & supervisor) +void +TransLogServer::exportRPC(FRT_Supervisor & supervisor) { _supervisor->SetSessionInitHook(FRT_METHOD(TransLogServer::initSession), this); _supervisor->SetSessionFiniHook(FRT_METHOD(TransLogServer::finiSession), this); @@ -344,7 +349,8 @@ void TransLogServer::exportRPC(FRT_Supervisor & supervisor) rb.ReturnDesc("syncedto", "Entry synced to"); } -void TransLogServer::createDomain(FRT_RPCRequest *req) +void +TransLogServer::createDomain(FRT_RPCRequest *req) { uint32_t retval(0); FRT_Values & params = *req->GetParams(); @@ -374,7 +380,8 @@ void TransLogServer::createDomain(FRT_RPCRequest *req) ret.AddInt32(retval); } -void TransLogServer::deleteDomain(FRT_RPCRequest *req) +void +TransLogServer::deleteDomain(FRT_RPCRequest *req) { uint32_t retval(0); vespalib::string msg("ok"); @@ -413,7 +420,8 @@ void TransLogServer::deleteDomain(FRT_RPCRequest *req) ret.AddString(msg.c_str()); } -void TransLogServer::openDomain(FRT_RPCRequest *req) +void +TransLogServer::openDomain(FRT_RPCRequest *req) { uint32_t retval(0); FRT_Values & params = *req->GetParams(); @@ -430,7 +438,8 @@ void TransLogServer::openDomain(FRT_RPCRequest *req) ret.AddInt32(retval); } -void TransLogServer::listDomains(FRT_RPCRequest *req) +void +TransLogServer::listDomains(FRT_RPCRequest *req) { FRT_Values & ret = *req->GetReturn(); LOG(debug, "listDomains()"); @@ -445,7 +454,8 @@ void TransLogServer::listDomains(FRT_RPCRequest *req) ret.AddString(domains.c_str()); } -void TransLogServer::domainStatus(FRT_RPCRequest *req) +void +TransLogServer::domainStatus(FRT_RPCRequest *req) { FRT_Values & params = *req->GetParams(); FRT_Values & ret = *req->GetReturn(); @@ -465,7 +475,8 @@ void TransLogServer::domainStatus(FRT_RPCRequest *req) } } -void TransLogServer::commit(const vespalib::string & domainName, const Packet & packet, DoneCallback done) +void +TransLogServer::commit(const vespalib::string & domainName, const Packet & packet, DoneCallback done) { (void) done; Domain::SP domain(findDomain(domainName)); @@ -476,7 +487,8 @@ void TransLogServer::commit(const vespalib::string & domainName, const Packet & } } -void TransLogServer::domainCommit(FRT_RPCRequest *req) +void +TransLogServer::domainCommit(FRT_RPCRequest *req) { FRT_Values & params = *req->GetParams(); FRT_Values & ret = *req->GetReturn(); @@ -501,7 +513,8 @@ void TransLogServer::domainCommit(FRT_RPCRequest *req) } } -void TransLogServer::domainVisit(FRT_RPCRequest *req) +void +TransLogServer::domainVisit(FRT_RPCRequest *req) { uint32_t retval(uint32_t(-1)); FRT_Values & params = *req->GetParams(); @@ -518,7 +531,8 @@ void TransLogServer::domainVisit(FRT_RPCRequest *req) ret.AddInt32(retval); } -void TransLogServer::domainSessionRun(FRT_RPCRequest *req) +void +TransLogServer::domainSessionRun(FRT_RPCRequest *req) { uint32_t retval(uint32_t(-1)); FRT_Values & params = *req->GetParams(); @@ -534,13 +548,15 @@ void TransLogServer::domainSessionRun(FRT_RPCRequest *req) ret.AddInt32(retval); } -void TransLogServer::relayToThreadRPC(FRT_RPCRequest *req) +void +TransLogServer::relayToThreadRPC(FRT_RPCRequest *req) { req->Detach(); _reqQ.push(req); } -void TransLogServer::domainSessionClose(FRT_RPCRequest *req) +void +TransLogServer::domainSessionClose(FRT_RPCRequest *req) { uint32_t retval(uint32_t(-1)); FRT_Values & params = *req->GetParams(); @@ -557,7 +573,8 @@ void TransLogServer::domainSessionClose(FRT_RPCRequest *req) ret.AddInt32(retval); } -void TransLogServer::domainPrune(FRT_RPCRequest *req) +void +TransLogServer::domainPrune(FRT_RPCRequest *req) { uint32_t retval(uint32_t(-1)); FRT_Values & params = *req->GetParams(); -- cgit v1.2.3