Skip to content

Commit fb528dd

Browse files
committed
Add trace logging when SSLService is set
Something is causing this to be set twice in LicenseTribeTests. These tribe tests do weird things to work around the SetOnce that XPackPlugin uses for the SslService, but that seems to be failing randomly. This additional logging will help work out which plugin instance is setting the SSLService when it should not be. Relates: elastic#42004
1 parent fab8fb7 commit fb528dd

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackPlugin.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66
package org.elasticsearch.xpack.core;
77

8-
import org.apache.logging.log4j.Logger;
98
import org.apache.logging.log4j.LogManager;
9+
import org.apache.logging.log4j.Logger;
1010
import org.apache.lucene.util.SetOnce;
1111
import org.elasticsearch.SpecialPermission;
1212
import org.elasticsearch.Version;
@@ -155,7 +155,12 @@ protected Clock getClock() {
155155
protected SSLService getSslService() { return getSharedSslService(); }
156156
protected LicenseService getLicenseService() { return getSharedLicenseService(); }
157157
protected XPackLicenseState getLicenseState() { return getSharedLicenseState(); }
158-
protected void setSslService(SSLService sslService) { XPackPlugin.sslService.set(sslService); }
158+
159+
protected void setSslService(SSLService sslService) {
160+
logger.trace("Setting SSLService to [{}] for plugin [{}]", sslService, this);
161+
XPackPlugin.sslService.set(sslService);
162+
}
163+
159164
protected void setLicenseService(LicenseService licenseService) { XPackPlugin.licenseService.set(licenseService); }
160165
protected void setLicenseState(XPackLicenseState licenseState) { XPackPlugin.licenseState.set(licenseState); }
161166
public static SSLService getSharedSslService() { return sslService.get(); }

x-pack/qa/tribe-tests-with-license/src/test/java/org/elasticsearch/license/LicenseTribeTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99
import org.elasticsearch.common.unit.TimeValue;
1010
import org.elasticsearch.protocol.xpack.license.DeleteLicenseRequest;
1111
import org.elasticsearch.protocol.xpack.license.GetLicenseRequest;
12+
import org.elasticsearch.test.junit.annotations.TestLogging;
1213

1314
import static org.elasticsearch.license.TestUtils.generateSignedLicense;
1415

16+
@TestLogging("org.elasticsearch.xpack.core.XPackPlugin:TRACE,org.elasticsearch.xpack.CompositeTestingXPackPlugin:TRACE")
1517
public class LicenseTribeTests extends TribeTransportTestCase {
1618

1719
@Override

0 commit comments

Comments
 (0)