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

Sync beta with master #3776

Merged
merged 2 commits into from
Nov 20, 2024
Merged

Sync beta with master #3776

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fd83b2
add elastic query timeout metric only on timeouts
sriram-atlan Nov 19, 2024
aab957c
Merge pull request #3775 from atlanhq/addElasticQueryTimeoutMetricMaster
sriram-atlan 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
25 changes: 21 additions & 4 deletions ...anus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasElasticsearchQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,10 @@ private DirectIndexQueryResult performAsyncDirectIndexQuery(SearchParams searchP
if (response == null) {
// Rather than null (if the response is null wil help returning @204 HTTP_NO_CONTENT to the user)
// return timeout exception to user
throw new AtlasBaseException(AtlasErrorCode.INDEX_SEARCH_FAILED_DUE_TO_TIMEOUT, KeepAliveTime);
}

if(response.isTimedOut()) {
LOG.error("timeout exceeded for query {}:", searchParams.getQuery());
RequestContext.get().endMetricRecord(RequestContext.get().startMetricRecord("elasticQueryTimeout"));
throw new AtlasBaseException(AtlasErrorCode.INDEX_SEARCH_FAILED_DUE_TO_TIMEOUT, KeepAliveTime);
Expand Down Expand Up @@ -294,6 +298,7 @@ public void onSuccess(Response response) {
Map<String, LinkedHashMap> responseMap = AtlasType.fromJson(respString, Map.class);
Boolean isInComplete = AtlasType.fromJson(AtlasType.toJson(responseMap.get("is_partial")), Boolean.class);
String id = AtlasType.fromJson(AtlasType.toJson(responseMap.get("id")), String.class);
boolean isTimedOut = AtlasType.fromJson(AtlasType.toJson(responseMap.get("response").get("timed_out")), Boolean.class);

if (isInComplete != null && isInComplete) {
/*
Expand All @@ -304,7 +309,7 @@ public void onSuccess(Response response) {
deleteAsyncSearchResponse(id);
future.complete(null);
}
AsyncQueryResult result = new AsyncQueryResult(respString, false);
AsyncQueryResult result = new AsyncQueryResult(respString, false, isTimedOut);
future.complete(result);
} catch (IOException e) {
future.completeExceptionally(e);
Expand Down Expand Up @@ -382,7 +387,8 @@ public void onSuccess(Response response) {
Map<String, LinkedHashMap> responseMap = AtlasType.fromJson(respString, Map.class);
boolean isRunning = AtlasType.fromJson(AtlasType.toJson(responseMap.get("is_running")), Boolean.class);
String id = AtlasType.fromJson(AtlasType.toJson(responseMap.get("id")), String.class);
AsyncQueryResult result = new AsyncQueryResult(respString, isRunning);
boolean isTimedOut = AtlasType.fromJson(AtlasType.toJson(responseMap.get("response").get("timed_out")), Boolean.class);
AsyncQueryResult result = new AsyncQueryResult(respString, isRunning, isTimedOut);
/*
* If the response is running, then we need to complete the future with the ID to retrieve this later
* Else we will complete the future with the response, if it completes within default timeout of 100ms
Expand Down Expand Up @@ -431,7 +437,7 @@ private String performDirectIndexQuery(String query, boolean source) throws Atla
LOG.warn(String.format("ES index with name %s not found", index));
throw new AtlasBaseException(INDEX_NOT_FOUND, index);
} else {
throw new AtlasBaseException(rex);
throw new AtlasBaseException(String.format("Error in executing elastic query: %s", EntityUtils.toString(entity)), rex);
}
}

Expand Down Expand Up @@ -633,6 +639,7 @@ public class AsyncQueryResult {
private boolean isRunning;
private String id;
private String fullResponse;
private boolean timedOut;

private boolean success;
// Constructor for a running process
Expand All @@ -643,10 +650,11 @@ public AsyncQueryResult(String id) {
}

// Constructor for a completed process
public AsyncQueryResult(String fullResponse, boolean isRunning) {
public AsyncQueryResult(String fullResponse, boolean isRunning, boolean timedOut) {
this.isRunning = isRunning;
this.id = null;
this.fullResponse = fullResponse;
this.timedOut = timedOut;
}

public void setRunning(boolean running) {
Expand All @@ -658,6 +666,15 @@ public boolean isRunning() {
return isRunning;
}

public void setTimedOut(boolean timedOut) {
this.timedOut = timedOut;
}

// Getters
public boolean isTimedOut() {
return timedOut;
}

void setId(String id) {
this.id = id;
}
Expand Down
Loading