Skip to content
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

[Backport 2.x] ignore more flaky tests #604

Merged
merged 1 commit into from
Sep 19, 2023
Merged

[Backport 2.x] ignore more flaky tests #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 18 additions & 20 deletions src/main/java/org/opensearch/securityanalytics/transport/TransportIndexDetectorAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,13 @@
import org.opensearch.threadpool.ThreadPool;
import org.opensearch.transport.TransportService;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -243,7 +241,7 @@ public void onFailure(Exception e) {
});
}

private void createMonitorFromQueries(List<Pair<String, Rule>> rulesById, Detector detector, ActionListener<List<IndexMonitorResponse>> listener, WriteRequest.RefreshPolicy refreshPolicy) throws SigmaError, IOException {
private void createMonitorFromQueries(List<Pair<String, Rule>> rulesById, Detector detector, ActionListener<List<IndexMonitorResponse>> listener, WriteRequest.RefreshPolicy refreshPolicy) throws Exception {
List<Pair<String, Rule>> docLevelRules = rulesById.stream().filter(it -> !it.getRight().isAggregationRule()).collect(
Collectors.toList());
List<Pair<String, Rule>> bucketLevelRules = rulesById.stream().filter(it -> it.getRight().isAggregationRule()).collect(
Expand Down Expand Up @@ -389,7 +387,7 @@ public void onFailure(Exception e) {
}
}

private void updateMonitorFromQueries(String index, List<Pair<String, Rule>> rulesById, Detector detector, ActionListener<List<IndexMonitorResponse>> listener, WriteRequest.RefreshPolicy refreshPolicy) throws SigmaError, IOException {
private void updateMonitorFromQueries(String index, List<Pair<String, Rule>> rulesById, Detector detector, ActionListener<List<IndexMonitorResponse>> listener, WriteRequest.RefreshPolicy refreshPolicy) throws Exception {
List<IndexMonitorRequest> monitorsToBeUpdated = new ArrayList<>();

List<Pair<String, Rule>> bucketLevelRules = rulesById.stream().filter(it -> it.getRight().isAggregationRule()).collect(
Expand Down Expand Up @@ -452,7 +450,7 @@ public void onResponse(Map<String, Map<String, String>> ruleFieldMappings) {
Collectors.toList()));

updateAlertingMonitors(rulesById, detector, monitorsToBeAdded, monitorsToBeUpdated, monitorIdsToBeDeleted, refreshPolicy, listener);
} catch (IOException | SigmaError ex) {
} catch (Exception ex) {
listener.onFailure(ex);
}
}
Expand Down Expand Up @@ -728,7 +726,7 @@ private IndexMonitorRequest createDocLevelMonitorMatchAllRequest(
return new IndexMonitorRequest(monitorId, SequenceNumbers.UNASSIGNED_SEQ_NO, SequenceNumbers.UNASSIGNED_PRIMARY_TERM, refreshPolicy, restMethod, monitor, null);
}

private void buildBucketLevelMonitorRequests(List<Pair<String, Rule>> queries, Detector detector, WriteRequest.RefreshPolicy refreshPolicy, String monitorId, RestRequest.Method restMethod, ActionListener<List<IndexMonitorRequest>> listener) throws IOException, SigmaError {
private void buildBucketLevelMonitorRequests(List<Pair<String, Rule>> queries, Detector detector, WriteRequest.RefreshPolicy refreshPolicy, String monitorId, RestRequest.Method restMethod, ActionListener<List<IndexMonitorRequest>> listener) throws Exception {

logTypeService.getRuleFieldMappings(new ActionListener<>() {
@Override
Expand Down Expand Up @@ -763,7 +761,7 @@ public void onResponse(Map<String, Map<String, String>> ruleFieldMappings) {
monitorRequests.add(createDocLevelMonitorMatchAllRequest(detector, RefreshPolicy.IMMEDIATE, detector.getId()+"_chained_findings", Method.POST));
}
listener.onResponse(monitorRequests);
} catch (IOException | SigmaError ex) {
} catch (Exception ex) {
listener.onFailure(ex);
}
}
Expand Down Expand Up @@ -897,7 +895,7 @@ public void onFailure(Exception e) {
}
}

private void onCreateMappingsResponse(CreateIndexResponse response) throws IOException {
private void onCreateMappingsResponse(CreateIndexResponse response) throws Exception {
if (response.isAcknowledged()) {
log.info(String.format(Locale.getDefault(), "Created %s with mappings.", Detector.DETECTORS_INDEX));
IndexUtils.detectorIndexUpdated();
Expand Down Expand Up @@ -950,7 +948,7 @@ public void onResponse(CreateIndexResponse response) {
try {
onCreateMappingsResponse(response);
prepareDetectorIndexing();
} catch (IOException e) {
} catch (Exception e) {
onFailures(e);
}
}
Expand All @@ -970,7 +968,7 @@ public void onResponse(AcknowledgedResponse response) {
onUpdateMappingsResponse(response);
try {
prepareDetectorIndexing();
} catch (IOException e) {
} catch (Exception e) {
onFailures(e);
}
}
Expand All @@ -984,7 +982,7 @@ public void onFailure(Exception e) {
} else {
prepareDetectorIndexing();
}
} catch (IOException e) {
} catch (Exception e) {
onFailures(e);
}
} else {
Expand All @@ -1001,7 +999,7 @@ public void onFailure(Exception e) {

}

void prepareDetectorIndexing() throws IOException {
void prepareDetectorIndexing() throws Exception {
if (request.getMethod() == RestRequest.Method.POST) {
createDetector();
} else if (request.getMethod() == RestRequest.Method.PUT) {
Expand Down Expand Up @@ -1038,7 +1036,7 @@ public void onResponse(List<IndexMonitorResponse> monitorResponses) {
request.getDetector().setRuleIdMonitorIdMap(mapMonitorIds(monitorResponses));
try {
indexDetector();
} catch (IOException e) {
} catch (Exception e) {
onFailures(e);
}
}
Expand All @@ -1055,7 +1053,7 @@ public void onFailure(Exception e) {
onFailures(e);
}
});
} catch (IOException e) {
} catch (Exception e) {
onFailures(e);
}
}
Expand Down Expand Up @@ -1098,7 +1096,7 @@ public void onResponse(GetResponse response) {
return;
}
onGetResponse(detector, detector.getUser());
} catch (IOException e) {
} catch (Exception e) {
onFailures(e);
}
}
Expand Down Expand Up @@ -1144,7 +1142,7 @@ public void onResponse(List<IndexMonitorResponse> monitorResponses) {
request.getDetector().setRuleIdMonitorIdMap(mapMonitorIds(monitorResponses));
try {
indexDetector();
} catch (IOException e) {
} catch (Exception e) {
onFailures(e);
}
}
Expand All @@ -1161,7 +1159,7 @@ public void onFailure(Exception e) {
onFailures(e);
}
});
} catch (IOException e) {
} catch (Exception e) {
onFailures(e);
}
}
Expand Down Expand Up @@ -1332,7 +1330,7 @@ public void onResponse(SearchResponse response) {
updateMonitorFromQueries(logIndex, queries, detector, listener, request.getRefreshPolicy());
}
}
} catch (IOException | SigmaError e) {
} catch (Exception e) {
onFailures(e);
}
}
Expand Down Expand Up @@ -1385,7 +1383,7 @@ public void onResponse(SearchResponse response) {
} else if (request.getMethod() == RestRequest.Method.PUT) {
updateMonitorFromQueries(logIndex, queries, detector, listener, request.getRefreshPolicy());
}
} catch (IOException | SigmaError ex) {
} catch (Exception ex) {
onFailures(ex);
}
}
Expand All @@ -1397,7 +1395,7 @@ public void onFailure(Exception e) {
});
}

public void indexDetector() throws IOException {
public void indexDetector() throws Exception {
IndexRequest indexRequest;
if (request.getMethod() == RestRequest.Method.POST) {
indexRequest = new IndexRequest(Detector.DETECTORS_INDEX)
Expand Down
4 changes: 4 additions & 0 deletions src/test/java/org/opensearch/securityanalytics/findings/FindingIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import java.util.stream.Collectors;
import org.apache.http.HttpStatus;
import org.junit.Assert;
import org.junit.Ignore;
import org.opensearch.client.Request;
import org.opensearch.client.Response;
import org.opensearch.client.ResponseException;
Expand Down Expand Up @@ -263,6 +264,7 @@ public void testGetFindings_byDetectorType_success() throws IOException {
Assert.assertEquals(1, getFindingsBody.get("total_findings"));
}

@Ignore
public void testGetFindings_rolloverByMaxAge_success() throws IOException, InterruptedException {

updateClusterSetting(FINDING_HISTORY_ROLLOVER_PERIOD.getKey(), "1s");
Expand Down Expand Up @@ -333,6 +335,7 @@ public void testGetFindings_rolloverByMaxAge_success() throws IOException, Inter
restoreAlertsFindingsIMSettings();
}

@Ignore
public void testGetFindings_rolloverByMaxDoc_success() throws IOException, InterruptedException {

updateClusterSetting(FINDING_HISTORY_ROLLOVER_PERIOD.getKey(), "1s");
Expand Down Expand Up @@ -398,6 +401,7 @@ public void testGetFindings_rolloverByMaxDoc_success() throws IOException, Inter
restoreAlertsFindingsIMSettings();
}

@Ignore
public void testGetFindings_rolloverByMaxDoc_short_retention_success() throws IOException, InterruptedException {
updateClusterSetting(FINDING_HISTORY_ROLLOVER_PERIOD.getKey(), "1s");
updateClusterSetting(FINDING_HISTORY_MAX_DOCS.getKey(), "1");
Expand Down
Loading