Skip to content

ability to specify params on request history in client #1427

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
ssalinas merged 2 commits into from
Feb 28, 2017
Merged

ability to specify params on request history in client #1427

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14d4cc4
ability to specify params on request history in client
ssalinas Feb 22, 2017
817b364
Keep the default at 100
ssalinas Feb 27, 2017
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
14 changes: 13 additions & 1 deletion SingularityClient/src/main/java/com/hubspot/singularity/client/SingularityClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,11 +936,23 @@ public Collection<SingularityTaskIdHistory> getActiveTaskHistoryForRequest(Strin
}

public Collection<SingularityTaskIdHistory> getInactiveTaskHistoryForRequest(String requestId) {
return getInactiveTaskHistoryForRequest(requestId, 100, 1);
}

public Collection<SingularityTaskIdHistory> getInactiveTaskHistoryForRequest(String requestId, int count, int page) {
return getInactiveTaskHistoryForRequest(requestId, count, page, Optional.<String>absent(), Optional.<String>absent(), Optional.<ExtendedTaskState>absent(), Optional.<Long>absent(), Optional.<Long>absent(), Optional.<Long>absent(), Optional.<Long>absent(), Optional.<OrderDirection>absent());
}

public Collection<SingularityTaskIdHistory> getInactiveTaskHistoryForRequest(String requestId, int count, int page, Optional<String> host, Optional<String> runId,
Optional<ExtendedTaskState> lastTaskStatus, Optional<Long> startedBefore, Optional<Long> startedAfter, Optional<Long> updatedBefore, Optional<Long> updatedAfter,
Optional<OrderDirection> orderDirection) {
final String requestUri = String.format(REQUEST_INACTIVE_TASKS_HISTORY_FORMAT, getHost(), contextPath, requestId);

final String type = String.format("inactive (failed, killed, lost) task history for request %s", requestId);

return getCollection(requestUri, type, TASKID_HISTORY_COLLECTION);
Map<String, Object> params = taskSearchParams(Optional.of(requestId), Optional.<String>absent(), runId, host, lastTaskStatus, startedBefore, startedAfter, updatedBefore, updatedAfter, orderDirection, count, page);

return getCollectionWithParams(requestUri, type, Optional.of(params), TASKID_HISTORY_COLLECTION);
}

public Optional<SingularityDeployHistory> getHistoryForRequestDeploy(String requestId, String deployId) {
Expand Down