-
Notifications
You must be signed in to change notification settings - Fork 8.2k
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.
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
[Response Ops][Task Manager] Propagate msearch
error status code so backpressure mechanism responds correctly
#197501
Open
ymao1
wants to merge
3
commits into
elastic:main
Choose a base branch
from
ymao1:tm-msearch-errors
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+63
−15
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License | ||
* 2.0; you may not use this file except in compliance with the Elastic License | ||
* 2.0. | ||
*/ | ||
|
||
export class MsearchError extends Error { | ||
private _statusCode: number; | ||
|
||
constructor(message: string, statusCode: number) { | ||
super(message); | ||
this._statusCode = statusCode; | ||
} | ||
|
||
public get statusCode() { | ||
return this._statusCode; | ||
} | ||
} | ||
|
||
export function getMsearchStatusCode(error: Error | MsearchError): number | undefined { | ||
if (Boolean(error && error instanceof MsearchError)) { | ||
return (error as MsearchError).statusCode; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -47,6 +47,7 @@ import { TaskValidator } from './task_validator'; | |
import { claimSort } from './queries/mark_available_tasks_as_claimed'; | ||
import { MAX_PARTITIONS } from './lib/task_partitioner'; | ||
import { ErrorOutput } from './lib/bulk_operation_buffer'; | ||
import { MsearchError } from './lib/msearch_error'; | ||
|
||
export interface StoreOpts { | ||
esClient: ElasticsearchClient; | ||
|
@@ -574,8 +575,11 @@ export class TaskStore { | |
let allTasks = new Array<ConcreteTaskInstance>(); | ||
|
||
for (const response of responses) { | ||
if (response.status !== 200) { | ||
const err = new Error(`Unexpected status code from taskStore::msearch: ${response.status}`); | ||
if (response.status && response.status !== 200) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: It's interesting that |
||
const err = new MsearchError( | ||
`Unexpected status code from taskStore::msearch: ${response.status}`, | ||
response.status | ||
); | ||
this.errors$.next(err); | ||
throw err; | ||
} | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
optional nit: not sure if we need this to ensure the
catch
path goes through.