fix bug Observability plugin calling createIndex from onNodeStarted m… #1885
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -96,32 +96,41 @@ internal object ObservabilityIndex : LifecycleListener() { | |
| */ | ||
| @Suppress("TooGenericExceptionCaught") | ||
| private fun createIndex() { | ||
| try { | ||
| // wait for the cluster here until it will finish managed node election | ||
| while (clusterService.state().blocks().hasGlobalBlockWithStatus(RestStatus.SERVICE_UNAVAILABLE)) { | ||
| log.info("Wait for cluster to be available ...") | ||
|
Comment on lines
+101
to
+102
There was a problem hiding this comment. Thanks for the fix! Do we know why was this only needed for 2.x and what's the path ahead to converge these branches? There was a problem hiding this comment. @ps48 I'm not sure why this was removed in the main branch |
||
| TimeUnit.SECONDS.sleep(1) | ||
| } | ||
| if (!isIndexExists(INDEX_NAME)) { | ||
| val classLoader = ObservabilityIndex::class.java.classLoader | ||
| val indexMappingSource = classLoader.getResource(OBSERVABILITY_MAPPING_FILE_NAME)?.readText()!! | ||
| val indexSettingsSource = classLoader.getResource(OBSERVABILITY_SETTINGS_FILE_NAME)?.readText()!! | ||
| val request = CreateIndexRequest(INDEX_NAME) | ||
| .mapping(indexMappingSource, XContentType.YAML) | ||
| .settings(indexSettingsSource, XContentType.YAML) | ||
| try { | ||
| val actionFuture = client.admin().indices().create(request) | ||
| val response = actionFuture.actionGet(PluginSettings.operationTimeoutMs) | ||
| if (response.isAcknowledged) { | ||
| log.info("$LOG_PREFIX:Index $INDEX_NAME creation Acknowledged") | ||
| reindexNotebooks() | ||
| } else { | ||
| error("$LOG_PREFIX:Index $INDEX_NAME creation not Acknowledged") | ||
| } | ||
| } catch (exception: ResourceAlreadyExistsException) { | ||
| log.warn("message: ${exception.message}") | ||
| } catch (exception: Exception) { | ||
| if (exception.cause !is ResourceAlreadyExistsException) { | ||
| throw exception | ||
| } | ||
| } | ||
| this.mappingsUpdated = true | ||
| } else if (!this.mappingsUpdated) { | ||
| updateMappings() | ||
| } | ||
| } catch (exception: Exception) { | ||
| log.error("Unexpected exception while initializing node $exception", exception) | ||
| } | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks can be removed as it is deprecated by github.