Commit 62fd0fb
authored
flushOnIdle use tryWithEngineOrNull (#134157)
Since it is an optimistic operation, we can let it be skipped if
the shard is currently being reset. That way the
IndexingMemoryController will not get stuck if a lot of shards
are gradually having their engines being reset.
Relates ES-124131 parent b6f5141 commit 62fd0fb
File tree
2 files changed
+103
-24
lines changed- server/src
- main/java/org/elasticsearch/index/shard
- test/java/org/elasticsearch/index/shard
2 files changed
+103
-24
lines changedLines changed: 43 additions & 24 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1528 | 1528 | | |
1529 | 1529 | | |
1530 | 1530 | | |
| 1531 | + | |
| 1532 | + | |
| 1533 | + | |
| 1534 | + | |
1531 | 1535 | | |
1532 | 1536 | | |
1533 | 1537 | | |
| |||
1539 | 1543 | | |
1540 | 1544 | | |
1541 | 1545 | | |
1542 | | - | |
| 1546 | + | |
| 1547 | + | |
| 1548 | + | |
1543 | 1549 | | |
1544 | 1550 | | |
1545 | 1551 | | |
| |||
2545 | 2551 | | |
2546 | 2552 | | |
2547 | 2553 | | |
2548 | | - | |
2549 | | - | |
2550 | | - | |
2551 | | - | |
2552 | | - | |
2553 | | - | |
2554 | | - | |
2555 | | - | |
2556 | | - | |
2557 | | - | |
2558 | | - | |
2559 | | - | |
| 2554 | + | |
| 2555 | + | |
| 2556 | + | |
| 2557 | + | |
| 2558 | + | |
| 2559 | + | |
| 2560 | + | |
| 2561 | + | |
| 2562 | + | |
2560 | 2563 | | |
2561 | | - | |
2562 | | - | |
2563 | | - | |
| 2564 | + | |
| 2565 | + | |
| 2566 | + | |
| 2567 | + | |
| 2568 | + | |
| 2569 | + | |
| 2570 | + | |
| 2571 | + | |
| 2572 | + | |
| 2573 | + | |
| 2574 | + | |
2564 | 2575 | | |
2565 | | - | |
2566 | | - | |
2567 | | - | |
2568 | | - | |
2569 | | - | |
| 2576 | + | |
| 2577 | + | |
| 2578 | + | |
| 2579 | + | |
| 2580 | + | |
| 2581 | + | |
| 2582 | + | |
| 2583 | + | |
2570 | 2584 | | |
2571 | | - | |
2572 | | - | |
| 2585 | + | |
| 2586 | + | |
| 2587 | + | |
| 2588 | + | |
| 2589 | + | |
| 2590 | + | |
2573 | 2591 | | |
2574 | | - | |
| 2592 | + | |
| 2593 | + | |
2575 | 2594 | | |
2576 | 2595 | | |
2577 | 2596 | | |
| |||
Lines changed: 60 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4497 | 4497 | | |
4498 | 4498 | | |
4499 | 4499 | | |
| 4500 | + | |
| 4501 | + | |
| 4502 | + | |
| 4503 | + | |
| 4504 | + | |
| 4505 | + | |
| 4506 | + | |
| 4507 | + | |
| 4508 | + | |
| 4509 | + | |
| 4510 | + | |
| 4511 | + | |
| 4512 | + | |
| 4513 | + | |
| 4514 | + | |
| 4515 | + | |
| 4516 | + | |
| 4517 | + | |
| 4518 | + | |
| 4519 | + | |
| 4520 | + | |
| 4521 | + | |
| 4522 | + | |
| 4523 | + | |
| 4524 | + | |
| 4525 | + | |
| 4526 | + | |
| 4527 | + | |
| 4528 | + | |
| 4529 | + | |
| 4530 | + | |
| 4531 | + | |
| 4532 | + | |
| 4533 | + | |
| 4534 | + | |
| 4535 | + | |
| 4536 | + | |
| 4537 | + | |
| 4538 | + | |
| 4539 | + | |
| 4540 | + | |
| 4541 | + | |
| 4542 | + | |
| 4543 | + | |
| 4544 | + | |
| 4545 | + | |
| 4546 | + | |
| 4547 | + | |
| 4548 | + | |
| 4549 | + | |
| 4550 | + | |
| 4551 | + | |
| 4552 | + | |
| 4553 | + | |
| 4554 | + | |
| 4555 | + | |
| 4556 | + | |
| 4557 | + | |
| 4558 | + | |
| 4559 | + | |
4500 | 4560 | | |
4501 | 4561 | | |
4502 | 4562 | | |
| |||
0 commit comments