Commit 4388449
authored
Ignore cancellation error when search is cancelled (#64240)
Since #63520, we will cancel a search that hits shard failures and does
not accept partial results. However, that change can return the wrong
HTTP code for bad requests (from 4xx to 5xx) due to the cancellation.
Relates #63520
Closes #64012
Closes #637021 parent 7384e68 commit 4388449
File tree
2 files changed
+8
-3
lines changed- server/src/main/java/org/elasticsearch/action/search
- x-pack/plugin/async-search/src/internalClusterTest/java/org/elasticsearch/xpack/search
2 files changed
+8
-3
lines changedLines changed: 8 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
| 47 | + | |
47 | 48 | | |
48 | 49 | | |
49 | 50 | | |
| |||
437 | 438 | | |
438 | 439 | | |
439 | 440 | | |
440 | | - | |
441 | | - | |
| 441 | + | |
| 442 | + | |
| 443 | + | |
442 | 444 | | |
443 | 445 | | |
444 | 446 | | |
| |||
469 | 471 | | |
470 | 472 | | |
471 | 473 | | |
| 474 | + | |
| 475 | + | |
| 476 | + | |
| 477 | + | |
472 | 478 | | |
473 | 479 | | |
474 | 480 | | |
| |||
Lines changed: 0 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
406 | 406 | | |
407 | 407 | | |
408 | 408 | | |
409 | | - | |
410 | 409 | | |
411 | 410 | | |
412 | 411 | | |
| |||
0 commit comments