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

Safe publication of AutoFollowCoordinator (#40153) 

We were leaking a reference to an AutoFollowCoordinator during
construction, violating safe publication according to the JLS
specification. This commit addresses this by waiting to register
AutoFollowCoordinator with the ClusterApplierService after the
AutoFollowCoordinator is fully constructed. We also remove ourselves as
a listener when stopping.
This commit is contained in:
Jason Tedor 2019-03-18 10:10:51 -04:00
parent 791814bb47
commit 5be12e0999
No known key found for this signature in database
GPG Key ID: FA89F05560F16BC5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/AutoFollowCoordinator.java
View File

@ -101,7 +101,6 @@ public class AutoFollowCoordinator extends AbstractLifecycleComponent implements
this.ccrLicenseChecker = Objects.requireNonNull(ccrLicenseChecker, "ccrLicenseChecker"); this.ccrLicenseChecker = Objects.requireNonNull(ccrLicenseChecker, "ccrLicenseChecker");
this.relativeMillisTimeProvider = relativeMillisTimeProvider; this.relativeMillisTimeProvider = relativeMillisTimeProvider;
this.absoluteMillisTimeProvider = absoluteMillisTimeProvider; this.absoluteMillisTimeProvider = absoluteMillisTimeProvider;
clusterService.addListener(this);
this.recentAutoFollowErrors = new LinkedHashMap<String, Tuple<Long, ElasticsearchException>>() { this.recentAutoFollowErrors = new LinkedHashMap<String, Tuple<Long, ElasticsearchException>>() {
@Override @Override
protected boolean removeEldestEntry(final Map.Entry<String, Tuple<Long, ElasticsearchException>> eldest) { protected boolean removeEldestEntry(final Map.Entry<String, Tuple<Long, ElasticsearchException>> eldest) {
@ -121,11 +120,12 @@ public class AutoFollowCoordinator extends AbstractLifecycleComponent implements
@Override @Override
protected void doStart() { protected void doStart() {
clusterService.addListener(this);
} }
@Override @Override
protected void doStop() { protected void doStop() {
clusterService.removeListener(this);
LOGGER.trace("stopping all auto-followers"); LOGGER.trace("stopping all auto-followers");
/* /*
* Synchronization is not necessary here; the field is volatile and the map is a copy-on-write map, any new auto-followers will not * Synchronization is not necessary here; the field is volatile and the map is a copy-on-write map, any new auto-followers will not