honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Core: Add warmer listener only when index service is set, in order to prevent possible NPE. 

The IndicesWarmer gets set before the InternalIndexService gets set, which can lead to a small time window were InternalIndexService isn't set

Closes #8140
Closes #8168
This commit is contained in:
Martijn van Groningen 2014-10-20 16:53:22 +02:00
parent d6f1ff0150
commit 7594ccbae6
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/org/elasticsearch/index/cache/fixedbitset/FixedBitSetFilterCache.java vendored
View File

@ -94,6 +94,13 @@ public class FixedBitSetFilterCache extends AbstractIndexComponent implements At
@Inject(optional = true)
public void setIndicesWarmer(IndicesWarmer indicesWarmer) {
this.indicesWarmer = indicesWarmer;
}
public void setIndexService(InternalIndexService indexService) {
this.indexService = indexService;
// First the indicesWarmer is set and then the indexService is set, because of this there is a small window of
// time where indexService is null. This is why the warmer should only registered after indexService has been set.
// Otherwise there is a small chance of the warmer running into a NPE, since it uses the indexService
indicesWarmer.addListener(warmer);
}
@ -164,10 +171,6 @@ public class FixedBitSetFilterCache extends AbstractIndexComponent implements At
}).fixedBitSet;
}
public void setIndexService(InternalIndexService indexService) {
this.indexService = indexService;
}
@Override
public void onRemoval(RemovalNotification<Object, Cache<Filter, Value>> notification) {
Object key = notification.getKey();
@ -283,10 +286,10 @@ public class FixedBitSetFilterCache extends AbstractIndexComponent implements At
final long start = System.nanoTime();
getAndLoadIfNotPresent(filterToWarm, ctx);
if (indexShard.warmerService().logger().isTraceEnabled()) {
indexShard.warmerService().logger().trace("warmed random access for [{}], took [{}]", filterToWarm, TimeValue.timeValueNanos(System.nanoTime() - start));
indexShard.warmerService().logger().trace("warmed fixed bitset for [{}], took [{}]", filterToWarm, TimeValue.timeValueNanos(System.nanoTime() - start));
}
} catch (Throwable t) {
indexShard.warmerService().logger().warn("failed to load random access for [{}]", t, filterToWarm);
indexShard.warmerService().logger().warn("failed to load fixed bitset for [{}]", t, filterToWarm);
} finally {
latch.countDown();
}