Commit 9a2ec69
committed
Die with dignity while merging
If an out of memory error is thrown while merging, today we quietly
rewrap it into a merge exception and the out of memory error is
lost. Instead, we need to rethrow out of memory errors, and in fact any
fatal error here, and let those go uncaught so that the node is torn
down. This commit causes this to be the case.
Relates #272651 parent b15484f commit 9a2ec69
File tree
11 files changed
+624
-383
lines changed- core/src
- main/java/org/elasticsearch
- bootstrap
- index/engine
- test/java/org/elasticsearch
- bootstrap
- index
- engine
- translog
- indices/recovery
- qa/evil-tests/src/test/java/org/elasticsearch/index/engine
- test/framework/src/main/java/org/elasticsearch/index
- engine
- translog
11 files changed
+624
-383
lines changedLines changed: 1 addition & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
25 | 24 | | |
26 | 25 | | |
27 | 26 | | |
| |||
68 | 67 | | |
69 | 68 | | |
70 | 69 | | |
71 | | - | |
72 | | - | |
73 | | - | |
74 | | - | |
75 | | - | |
| 70 | + | |
76 | 71 | | |
77 | 72 | | |
78 | 73 | | |
| |||
Lines changed: 31 additions & 14 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1592 | 1592 | | |
1593 | 1593 | | |
1594 | 1594 | | |
1595 | | - | |
1596 | 1595 | | |
1597 | 1596 | | |
1598 | 1597 | | |
1599 | 1598 | | |
1600 | 1599 | | |
1601 | 1600 | | |
1602 | | - | |
1603 | | - | |
1604 | | - | |
1605 | | - | |
1606 | | - | |
1607 | | - | |
1608 | | - | |
1609 | | - | |
1610 | | - | |
1611 | | - | |
| 1601 | + | |
| 1602 | + | |
| 1603 | + | |
1612 | 1604 | | |
1613 | 1605 | | |
1614 | 1606 | | |
| |||
1929 | 1921 | | |
1930 | 1922 | | |
1931 | 1923 | | |
1932 | | - | |
1933 | 1924 | | |
1934 | 1925 | | |
1935 | 1926 | | |
| |||
1938 | 1929 | | |
1939 | 1930 | | |
1940 | 1931 | | |
1941 | | - | |
1942 | | - | |
| 1932 | + | |
| 1933 | + | |
| 1934 | + | |
| 1935 | + | |
| 1936 | + | |
| 1937 | + | |
| 1938 | + | |
| 1939 | + | |
1943 | 1940 | | |
1944 | 1941 | | |
1945 | 1942 | | |
1946 | 1943 | | |
1947 | 1944 | | |
| 1945 | + | |
| 1946 | + | |
| 1947 | + | |
| 1948 | + | |
| 1949 | + | |
| 1950 | + | |
| 1951 | + | |
| 1952 | + | |
| 1953 | + | |
| 1954 | + | |
| 1955 | + | |
| 1956 | + | |
| 1957 | + | |
| 1958 | + | |
| 1959 | + | |
| 1960 | + | |
| 1961 | + | |
| 1962 | + | |
| 1963 | + | |
| 1964 | + | |
1948 | 1965 | | |
1949 | 1966 | | |
1950 | 1967 | | |
| |||
Lines changed: 0 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | | - | |
23 | 22 | | |
24 | 23 | | |
25 | 24 | | |
| |||
131 | 130 | | |
132 | 131 | | |
133 | 132 | | |
134 | | - | |
135 | 133 | | |
136 | 134 | | |
137 | 135 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
33 | | - | |
| 33 | + | |
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
| |||
0 commit comments