Skip to content

Error log when license verification fails locally #102919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Dec 5, 2023
Merged

Error log when license verification fails locally #102919

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5e507ea
refactor nit to updateXPackLicenseState
albertzaharovits Dec 4, 2023
cb3ad2e
Refactor maybeRegisterOrUpdateLicense
albertzaharovits Dec 4, 2023
5983cfe
Log license verification failures
albertzaharovits Dec 4, 2023
74e9496
Noop
albertzaharovits Dec 4, 2023
11979ff
Noop
albertzaharovits Dec 4, 2023
ec646b3
Noop
albertzaharovits Dec 4, 2023
f2b10e4
Update docs/changelog/102919.yaml
albertzaharovits Dec 4, 2023
fe58eb3
Comments
albertzaharovits Dec 4, 2023
d8eb8fd
Merge branch 'main' into license-expiration-message
albertzaharovits Dec 5, 2023
0c360c2
Remove isReadyForXPackCustomMetadata
albertzaharovits Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 31 additions & 28 deletions x-pack/plugin/core/src/main/java/org/elasticsearch/license/ClusterStateLicenseService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,14 +413,6 @@ public void clusterChanged(ClusterChangedEvent event) {
final ClusterState previousClusterState = event.previousState();
final ClusterState currentClusterState = event.state();
if (currentClusterState.blocks().hasGlobalBlock(GatewayService.STATE_NOT_RECOVERED_BLOCK) == false) {
if (XPackPlugin.isReadyForXPackCustomMetadata(currentClusterState) == false) {
logger.debug(
"cannot add license to cluster as the following nodes might not understand the license metadata: {}",
() -> XPackPlugin.nodesNotReadyForXPackCustomMetadata(currentClusterState)
);
return;
}

final LicensesMetadata prevLicensesMetadata = previousClusterState.getMetadata().custom(LicensesMetadata.TYPE);
final LicensesMetadata currentLicensesMetadata = currentClusterState.getMetadata().custom(LicensesMetadata.TYPE);
// notify all interested plugins
Expand All @@ -439,26 +431,7 @@ public void clusterChanged(ClusterChangedEvent event) {
} else {
logger.trace("license unchanged [{}]", currentLicensesMetadata);
}

License currentLicense = null;
boolean noLicenseInPrevMetadata = prevLicensesMetadata == null || prevLicensesMetadata.getLicense() == null;
if (noLicenseInPrevMetadata == false) {
currentLicense = prevLicensesMetadata.getLicense();
}
boolean noLicenseInCurrentMetadata = (currentLicensesMetadata == null || currentLicensesMetadata.getLicense() == null);
if (noLicenseInCurrentMetadata == false) {
currentLicense = currentLicensesMetadata.getLicense();
}

boolean noLicense = noLicenseInPrevMetadata && noLicenseInCurrentMetadata;
// auto-generate license if no licenses ever existed or if the current license is basic and
// needs extended or if the license signature needs to be updated. this will trigger a subsequent cluster changed event
if (currentClusterState.getNodes().isLocalNodeElectedMaster()
&& (noLicense
|| LicenseUtils.licenseNeedsExtended(currentLicense)
|| LicenseUtils.signatureNeedsUpdate(currentLicense, currentClusterState.nodes()))) {
registerOrUpdateSelfGeneratedLicense();
}
maybeRegisterOrUpdateLicense(previousClusterState, currentClusterState);
} else if (logger.isDebugEnabled()) {
logger.debug("skipped license notifications reason: [{}]", GatewayService.STATE_NOT_RECOVERED_BLOCK);
}
Expand All @@ -479,6 +452,36 @@ private void updateXPackLicenseState(License license) {
}
}

private void maybeRegisterOrUpdateLicense(ClusterState previousClusterState, ClusterState currentClusterState) {
if (XPackPlugin.isReadyForXPackCustomMetadata(currentClusterState) == false) {
Copy link
Contributor

@jakelandis jakelandis Dec 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 to completely remove this whole if block if you choose to ... i started to remove these across the board... but kinda forgot about it: #95428

Copy link
Contributor Author

@albertzaharovits albertzaharovits Dec 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, thank you for the indication!
I also wanted to ask about it, but similarly omitted....
I've pushed 0c360c2 .

logger.debug(
"cannot add license to cluster as the following nodes might not understand the license metadata: {}",
() -> XPackPlugin.nodesNotReadyForXPackCustomMetadata(currentClusterState)
);
return;
}
final LicensesMetadata prevLicensesMetadata = previousClusterState.getMetadata().custom(LicensesMetadata.TYPE);
final LicensesMetadata currentLicensesMetadata = currentClusterState.getMetadata().custom(LicensesMetadata.TYPE);
License currentLicense = null;
boolean noLicenseInPrevMetadata = prevLicensesMetadata == null || prevLicensesMetadata.getLicense() == null;
if (noLicenseInPrevMetadata == false) {
currentLicense = prevLicensesMetadata.getLicense();
}
boolean noLicenseInCurrentMetadata = (currentLicensesMetadata == null || currentLicensesMetadata.getLicense() == null);
if (noLicenseInCurrentMetadata == false) {
currentLicense = currentLicensesMetadata.getLicense();
}
boolean noLicense = noLicenseInPrevMetadata && noLicenseInCurrentMetadata;
// auto-generate license if no licenses ever existed or if the current license is basic and
// needs extended or if the license signature needs to be updated. this will trigger a subsequent cluster changed event
if (currentClusterState.getNodes().isLocalNodeElectedMaster()
&& (noLicense
|| LicenseUtils.licenseNeedsExtended(currentLicense)
|| LicenseUtils.signatureNeedsUpdate(currentLicense, currentClusterState.nodes()))) {
registerOrUpdateSelfGeneratedLicense();
}
}

/**
* Notifies registered licensees of license state change and/or new active license
* based on the license in <code>currentLicensesMetadata</code>.
Expand Down