523 bug fix - Sending notification under more error conditions #667
Conversation
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
Signed-off-by: Angie Zhang <langelzh@amazon.com>
1 task
Codecov Report
@@ Coverage Diff @@
## main #667 +/- ##
============================================
- Coverage 75.56% 75.53% -0.04%
- Complexity 2657 2663 +6
============================================
Files 333 333
Lines 15395 15453 +58
Branches 2384 2395 +11
============================================
+ Hits 11633 11672 +39
- Misses 2410 2414 +4
- Partials 1352 1367 +15
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
| @@ -527,6 +560,7 @@ object ManagedIndexRunner : | |||
|
|
|||
| @Suppress("TooGenericExceptionCaught") | |||
| private suspend fun disableManagedIndexConfig(managedIndexConfig: ManagedIndexConfig) { | |||
| logger.info("Start to disable ManagedIndexConfig") | |||
Comment on lines
+879
to
+890
| private fun compileTemplate(template: Script, managedIndexConfig: ManagedIndexConfig): String { | ||
| return try { | ||
| scriptService.compile(template, TemplateScript.CONTEXT) | ||
| .newInstance(template.params + mapOf("ctx" to managedIndexConfig.convertToMap())) | ||
| .execute() | ||
| } catch (e: Exception) { | ||
| val message = "There was an error compiling mustache template" | ||
| logger.error(message, e) | ||
| e.message ?: message | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
Refactor this. Just one compileTemplate here is enough, the only difference is "ctx", let's explicitly choose fields to put into context
Comment on lines
+864
to
+877
| private suspend fun publishErrorNotification(policy: Policy?, managedIndexConfig: ManagedIndexConfig, additionalMessage: String) { | ||
| if (policy == null) { | ||
| logger.error("Policy for index ${managedIndexConfig.index} is not available to obtain. Notifications for this policy is aborted.") | ||
| return | ||
| } | ||
| policy.errorNotification?.run { | ||
| errorNotificationRetryPolicy.retry(logger) { | ||
| val compiledMessage = compileTemplate(messageTemplate, managedIndexConfig) | ||
| val finalMessage = "$additionalMessage $compiledMessage" | ||
| destination?.buildLegacyBaseMessage(null, finalMessage)?.publishLegacyNotification(client) | ||
| channel?.sendNotification(client, ErrorNotification.CHANNEL_TITLE, managedIndexConfig, compiledMessage, policy.user) | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
Can we combine this with above same name method? additionalMessage method can be nullable
For managedIndexMetaData, managedIndexConfig, we can just pick out index uuid, index name and input here. You can check if any other fields are useful to compose the notification message
Comment on lines
+273
to
+277
| // doing a check of local cluster health as we do not want to overload cluster manager node with potentially a lot of calls | ||
| if (clusterIsRed()) { | ||
| val message = "Skipping current execution of ${managedIndexConfig.index} because of red cluster health." | ||
| logger.debug(message) | ||
| publishErrorNotification(policy, managedIndexConfig, message) |
There was a problem hiding this comment.
Red cluster check has to be at top, because it may affect all the following step: read metadata, write... Any reason to move it here?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Signed-off-by: Angie Zhang langelzh@amazon.com
Issue #, if available:
#523
Description of changes:
CheckList:
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.