summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@oath.com>2017-11-28 13:31:51 +0000
committerTor Egge <Tor.Egge@oath.com>2017-11-28 13:31:51 +0000
commitaa1e45bb4859bc3dd8dbc815eafbd6bd1b9a202b (patch)
treed9ae43309f280ef1a08ff2518cab605d8568d82b /searchcore
parent58e1f3b9b4dde495f6b9554f670367f45aed49ef (diff)
Try to prune tls when shutting down flush engine or when completing
handling of a priority flush strategy.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/proton/flushengine/flushengine.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.cpp b/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.cpp
index 00b9b5c8fd7..fb0b114d4b3 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.cpp
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.cpp
@@ -169,6 +169,8 @@ FlushEngine::Run(FastOS_ThreadInterface *thread, void *arg)
}
LOG(debug, "Making another wait(idle=%s, timeMS=%d) last was '%s'", shouldIdle ? "true" : "false", shouldIdle ? _idleIntervalMS : 0, prevFlushName.c_str());
}
+ _executor.sync();
+ prune();
}
bool
@@ -299,6 +301,7 @@ FlushEngine::flushNextTarget(const vespalib::string & name)
// Everything returned from a priority strategy should be flushed
flushAll(lst.first);
_executor.sync();
+ prune();
_priorityStrategy.reset();
_strategyCond.notify_all();
return "";