Commit 0296f7f
authored
Load field caps from store if they haven't been initialised through a refresh yet.
Keep the plain reads to not mess with performance characteristics too much on the good path but protect against confusing races when loading field infos now (that probably should have been ordered stores in the first place but this was safe due to other locks/volatiles on the refresh path).
Closes #125483
1 parent 7bf6161 commit 0296f7f
File tree
3 files changed
+42
-10
lines changed- docs/changelog
- server/src/main/java/org/elasticsearch/index/shard
- x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots
3 files changed
+42
-10
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
Lines changed: 30 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
156 | 156 | | |
157 | 157 | | |
158 | 158 | | |
| 159 | + | |
| 160 | + | |
159 | 161 | | |
160 | 162 | | |
161 | 163 | | |
| |||
413 | 415 | | |
414 | 416 | | |
415 | 417 | | |
416 | | - | |
417 | 418 | | |
418 | 419 | | |
419 | 420 | | |
| |||
1011 | 1012 | | |
1012 | 1013 | | |
1013 | 1014 | | |
1014 | | - | |
1015 | | - | |
| 1015 | + | |
| 1016 | + | |
| 1017 | + | |
| 1018 | + | |
| 1019 | + | |
| 1020 | + | |
| 1021 | + | |
| 1022 | + | |
1016 | 1023 | | |
1017 | 1024 | | |
1018 | 1025 | | |
1019 | | - | |
| 1026 | + | |
| 1027 | + | |
| 1028 | + | |
| 1029 | + | |
| 1030 | + | |
| 1031 | + | |
| 1032 | + | |
| 1033 | + | |
| 1034 | + | |
1020 | 1035 | | |
1021 | 1036 | | |
1022 | 1037 | | |
| |||
4067 | 4082 | | |
4068 | 4083 | | |
4069 | 4084 | | |
4070 | | - | |
4071 | | - | |
4072 | | - | |
4073 | | - | |
4074 | | - | |
4075 | | - | |
| 4085 | + | |
| 4086 | + | |
4076 | 4087 | | |
4077 | 4088 | | |
4078 | 4089 | | |
4079 | 4090 | | |
| 4091 | + | |
| 4092 | + | |
| 4093 | + | |
| 4094 | + | |
| 4095 | + | |
| 4096 | + | |
| 4097 | + | |
| 4098 | + | |
| 4099 | + | |
4080 | 4100 | | |
4081 | 4101 | | |
4082 | 4102 | | |
| |||
Lines changed: 5 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| 10 | + | |
10 | 11 | | |
11 | 12 | | |
12 | 13 | | |
| |||
125 | 126 | | |
126 | 127 | | |
127 | 128 | | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
128 | 133 | | |
129 | 134 | | |
0 commit comments