Skip to content

[Fix-16820][Alert] fix alert status after alert sent by AlertSender #16824

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
SbloodyS merged 3 commits into from
Nov 20, 2024
Merged

[Fix-16820][Alert] fix alert status after alert sent by AlertSender #16824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e58790
[FIX-16820][Alert] fix alert status after alert sent by AlertSender
toujours33 Nov 20, 2024
e5dc223
fix code style
toujours33 Nov 20, 2024
f812101
Merge branch 'dev' into fix-16820
SbloodyS Nov 20, 2024
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
4 changes: 2 additions & 2 deletions ...t-server/src/main/java/org/apache/dolphinscheduler/alert/service/AbstractEventSender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ public void sendEvent(T event) {
alertSendStatuses.add(alertSendStatus);
}
long failureCount = alertSendStatuses.stream()
.map(alertSendStatus -> alertSendStatus.getSendStatus() == AlertStatus.EXECUTION_FAILURE)
.filter(alertSendStatus -> alertSendStatus.getSendStatus() == AlertStatus.EXECUTION_FAILURE)
.count();
long successCount = alertSendStatuses.stream()
.map(alertSendStatus -> alertSendStatus.getSendStatus() == AlertStatus.EXECUTION_SUCCESS)
.filter(alertSendStatus -> alertSendStatus.getSendStatus() == AlertStatus.EXECUTION_SUCCESS)
.count();
if (successCount == 0) {
onError(event, JSONUtils.toJsonString(alertSendStatuses));
Expand Down
50 changes: 40 additions & 10 deletions ...-alert-server/src/test/java/org/apache/dolphinscheduler/alert/runner/AlertSenderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,20 @@

package org.apache.dolphinscheduler.alert.runner;

import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import org.apache.dolphinscheduler.alert.api.AlertChannel;
import org.apache.dolphinscheduler.alert.api.AlertResult;
import org.apache.dolphinscheduler.alert.config.AlertConfig;
import org.apache.dolphinscheduler.alert.plugin.AlertPluginManager;
import org.apache.dolphinscheduler.alert.service.AlertSender;
import org.apache.dolphinscheduler.common.enums.AlertStatus;
import org.apache.dolphinscheduler.common.enums.AlertType;
import org.apache.dolphinscheduler.common.enums.WarningType;
import org.apache.dolphinscheduler.common.utils.JSONUtils;
import org.apache.dolphinscheduler.dao.AlertDao;
Expand Down Expand Up @@ -148,22 +154,46 @@ void testRun() {
alert.setTitle(TITLE);
alert.setContent(CONTENT);
alert.setWarningType(WarningType.FAILURE);
alert.setAlertType(AlertType.TASK_FAILURE);

int pluginDefineId = 1;
String pluginInstanceParams = "alert-instance-mail-params";
String pluginInstanceName = "alert-instance-mail";
List<AlertPluginInstance> alertInstanceList = new ArrayList<>();
when(alertDao.listInstanceByAlertGroupId(ALERT_GROUP_ID)).thenReturn(alertInstanceList);

// 1. alert plugin send success
AlertPluginInstance alertPluginInstance = new AlertPluginInstance(
pluginDefineId, pluginInstanceParams, pluginInstanceName);
PLUGIN_DEFINE_ID, PLUGIN_INSTANCE_PARAMS, PLUGIN_INSTANCE_NAME);
alertPluginInstance.setId(alertPluginInstance.getPluginDefineId());
alertInstanceList.add(alertPluginInstance);
when(alertDao.listInstanceByAlertGroupId(ALERT_GROUP_ID)).thenReturn(alertInstanceList);

AlertResult alertResult = new AlertResult();
alertResult.setSuccess(true);
alertResult.setMessage(String.format("Alert Plugin %s send success", pluginInstanceName));
Assertions.assertTrue(alertResult.isSuccess());
when(alertDao.listInstanceByAlertGroupId(1)).thenReturn(new ArrayList<>());
AlertChannel alertChannelMock = mock(AlertChannel.class);
when(alertPluginManager.getAlertChannel(PLUGIN_DEFINE_ID)).thenReturn(Optional.of(alertChannelMock));
AlertResult alertSuccessResult = AlertResult.success();
when(alertChannelMock.process(Mockito.any())).thenReturn(alertSuccessResult);
alertSender.sendEvent(alert);
verify(alertDao).updateAlert(eq(AlertStatus.EXECUTION_SUCCESS), anyString(), anyInt());

// 2. alert plugin send failed
AlertPluginInstance otherAlertPluginInstance = new AlertPluginInstance(
PLUGIN_DEFINE_ID + 1, PLUGIN_INSTANCE_PARAMS, PLUGIN_INSTANCE_NAME);
otherAlertPluginInstance.setId(otherAlertPluginInstance.getPluginDefineId());
alertInstanceList.clear();
alertInstanceList.add(otherAlertPluginInstance);

AlertChannel otherAlertChannelMock = mock(AlertChannel.class);
when(alertPluginManager.getAlertChannel(PLUGIN_DEFINE_ID + 1)).thenReturn(Optional.of(otherAlertChannelMock));
AlertResult alertFailedResult =
AlertResult.fail(String.format("Alert Plugin %s send failed", PLUGIN_INSTANCE_NAME));
when(otherAlertChannelMock.process(Mockito.any())).thenReturn(alertFailedResult);
alertSender.sendEvent(alert);
verify(alertDao).updateAlert(eq(AlertStatus.EXECUTION_FAILURE), anyString(), anyInt());

// 3. alert plugin send partial success
alertInstanceList.clear();
alertInstanceList.add(alertPluginInstance);
alertInstanceList.add(otherAlertPluginInstance);
alertSender.sendEvent(alert);
verify(alertDao).updateAlert(eq(AlertStatus.EXECUTION_PARTIAL_SUCCESS), anyString(), anyInt());

}

@Test
Expand Down