Skip to content

Fix NPE when no recipients configured for sending alerts #5154

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
yadvr merged 3 commits into from
Jul 5, 2021
Merged

Fix NPE when no recipients configured for sending alerts #5154

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce41265
Fix NPE when no recipients configured for sending alerts
Pearl1594 Jun 24, 2021
1388b70
Adding logs
Pearl1594 Jun 24, 2021
a28e837
Address comments
Pearl1594 Jun 29, 2021
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
5 changes: 5 additions & 0 deletions server/src/main/java/com/cloud/alert/AlertManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,6 +718,11 @@ public void sendAlert(AlertType alertType, long dataCenterId, Long podId, Long c
mailProps.setContent(content);
mailProps.setContentType("text/plain");

if (recipients == null) {

@yadvr yadvr Jun 28, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

cc @DaanHoogland @GutoVeronezi can you review this thanks.

@yadvr yadvr Jun 28, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Nevermind Daan already LGTM'd. Let's wait for the test.

@GutoVeronezi GutoVeronezi Jun 28, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Maybe we could do this validation before instantiating the properties.

s_logger.info("No recipients set in 'alert.email.addresses', skipping sending an alert");

@GutoVeronezi GutoVeronezi Jun 28, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We could add subject and content to the message, e.g. ... skipping sending alert with subject [%s] and content [%s].
Also, IMHO, I think it would be better to log it as warning.

return;
Comment thread
Pearl1594 marked this conversation as resolved.
Outdated
}

Set<MailAddress> addresses = new HashSet<>();
for (String recipient : recipients) {
addresses.add(new MailAddress(recipient));
Expand Down