Skip to content

Commit 5a4ef59

Browse files
authored
Merge branch 'main' into fix/117042_Support_7x_segments_as_archive_in_8x
2 parents 80919b6 + f1f2df7 commit 5a4ef59

File tree

125 files changed

+2132
-3174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+2132
-3174
lines changed

docs/changelog/123588.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 123588
2+
summary: Give Kibana user 'all' permissions for .entity_analytics.* indices
3+
area: Infra/Core
4+
type: enhancement
5+
issues: []

docs/changelog/123757.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 123757
2+
summary: Fix concurrency issue in `ScriptSortBuilder`
3+
area: Search
4+
type: bug
5+
issues: []

docs/changelog/124394.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 124394
2+
summary: Avoid `NamedWritable` in block serialization
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

docs/changelog/124424.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 124424
2+
summary: Lazy collection copying during node transform
3+
area: ES|QL
4+
type: bug
5+
issues: []

docs/changelog/124451.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 124451
2+
summary: Improve downsample performance by avoiding to read unnecessary dimension values when downsampling.
3+
area: Downsampling
4+
type: bug
5+
issues: []

libs/entitlement/qa/entitled-plugin/src/main/java/org/elasticsearch/entitlement/qa/entitled/EntitledActions.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,19 @@ public static Path createTempSymbolicLink() throws IOException {
6666
return Files.createSymbolicLink(readDir().resolve("entitlements-link-" + random.nextLong()), readWriteDir());
6767
}
6868

69+
public static Path createK8sLikeMount() throws IOException {
70+
Path baseDir = readDir().resolve("k8s");
71+
var versionedDir = Files.createDirectories(baseDir.resolve("..version"));
72+
var actualFileMount = Files.createFile(versionedDir.resolve("mount-" + random.nextLong() + ".tmp"));
73+
74+
var dataDir = Files.createSymbolicLink(baseDir.resolve("..data"), versionedDir.getFileName());
75+
// mount-0.tmp -> ..data/mount-0.tmp -> ..version/mount-0.tmp
76+
return Files.createSymbolicLink(
77+
baseDir.resolve(actualFileMount.getFileName()),
78+
dataDir.getFileName().resolve(actualFileMount.getFileName())
79+
);
80+
}
81+
6982
public static URLConnection createHttpURLConnection() throws IOException {
7083
return URI.create("http://127.0.0.1:12345/").toURL().openConnection();
7184
}

libs/entitlement/qa/entitlement-test-plugin/src/main/java/org/elasticsearch/entitlement/qa/test/FileCheckActions.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,13 @@ static void fileCreateTempFile() throws IOException {
9393

9494
@EntitlementTest(expectedAccess = PLUGINS)
9595
static void fileDelete() throws IOException {
96-
Path toDelete = readWriteDir().resolve("to_delete");
97-
EntitledActions.createFile(toDelete);
96+
var toDelete = EntitledActions.createTempFileForWrite();
9897
toDelete.toFile().delete();
9998
}
10099

101100
@EntitlementTest(expectedAccess = PLUGINS)
102101
static void fileDeleteOnExit() throws IOException {
103-
Path toDelete = readWriteDir().resolve("to_delete_on_exit");
104-
EntitledActions.createFile(toDelete);
102+
var toDelete = EntitledActions.createTempFileForWrite();
105103
toDelete.toFile().deleteOnExit();
106104
}
107105

@@ -174,9 +172,10 @@ static void fileMkdirs() {
174172

175173
@EntitlementTest(expectedAccess = PLUGINS)
176174
static void fileRenameTo() throws IOException {
177-
Path toRename = readWriteDir().resolve("to_rename");
175+
var dir = EntitledActions.createTempDirectoryForWrite();
176+
Path toRename = dir.resolve("to_rename");
178177
EntitledActions.createFile(toRename);
179-
toRename.toFile().renameTo(readWriteDir().resolve("renamed").toFile());
178+
toRename.toFile().renameTo(dir.resolve("renamed").toFile());
180179
}
181180

182181
@EntitlementTest(expectedAccess = PLUGINS)
@@ -206,8 +205,7 @@ static void fileSetReadableOwner() {
206205

207206
@EntitlementTest(expectedAccess = PLUGINS)
208207
static void fileSetReadOnly() throws IOException {
209-
Path readOnly = readWriteDir().resolve("read_only");
210-
EntitledActions.createFile(readOnly);
208+
Path readOnly = EntitledActions.createTempFileForWrite();
211209
readOnly.toFile().setReadOnly();
212210
}
213211

libs/entitlement/qa/entitlement-test-plugin/src/main/java/org/elasticsearch/entitlement/qa/test/NioFilesActions.java

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,16 @@ static void checkFilesCreateSymbolicLink() throws IOException {
140140
}
141141
}
142142

143+
@EntitlementTest(expectedAccess = PLUGINS)
144+
static void checkFilesCreateRelativeSymbolicLink() throws IOException {
145+
var directory = EntitledActions.createTempDirectoryForWrite();
146+
try {
147+
Files.createSymbolicLink(directory.resolve("link"), Path.of("target"));
148+
} catch (UnsupportedOperationException | FileSystemException e) {
149+
// OK not to implement symbolic link in the filesystem
150+
}
151+
}
152+
143153
@EntitlementTest(expectedAccess = PLUGINS)
144154
static void checkFilesCreateLink() throws IOException {
145155
var directory = EntitledActions.createTempDirectoryForWrite();
@@ -150,6 +160,17 @@ static void checkFilesCreateLink() throws IOException {
150160
}
151161
}
152162

163+
@EntitlementTest(expectedAccess = PLUGINS)
164+
static void checkFilesCreateRelativeLink() throws IOException {
165+
var directory = EntitledActions.createTempDirectoryForWrite();
166+
var target = directory.resolve("target");
167+
try {
168+
Files.createLink(directory.resolve("link"), Path.of("target"));
169+
} catch (UnsupportedOperationException | FileSystemException e) {
170+
// OK not to implement symbolic link in the filesystem
171+
}
172+
}
173+
153174
@EntitlementTest(expectedAccess = PLUGINS)
154175
static void checkFilesDelete() throws IOException {
155176
var file = EntitledActions.createTempFileForWrite();

libs/entitlement/qa/entitlement-test-plugin/src/main/java/org/elasticsearch/entitlement/qa/test/PathActions.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
package org.elasticsearch.entitlement.qa.test;
1111

12+
import org.elasticsearch.entitlement.qa.entitled.EntitledActions;
13+
1214
import java.io.IOException;
1315
import java.nio.file.FileSystems;
1416
import java.nio.file.LinkOption;
@@ -24,6 +26,11 @@ static void checkToRealPath() throws IOException {
2426
FileCheckActions.readFile().toRealPath();
2527
}
2628

29+
@EntitlementTest(expectedAccess = PLUGINS)
30+
static void checkToRealPathWithK8sLikeMount() throws IOException, Exception {
31+
EntitledActions.createK8sLikeMount().toRealPath();
32+
}
33+
2734
@EntitlementTest(expectedAccess = PLUGINS)
2835
static void checkToRealPathNoFollow() throws IOException {
2936
FileCheckActions.readFile().toRealPath(LinkOption.NOFOLLOW_LINKS);

libs/entitlement/qa/src/javaRestTest/java/org/elasticsearch/entitlement/qa/EntitlementsTestRule.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ class EntitlementsTestRule implements TestRule {
4040
"files",
4141
List.of(
4242
Map.of("path", tempDir.resolve("read_dir"), "mode", "read_write"),
43+
Map.of("path", tempDir.resolve("read_dir").resolve("k8s").resolve("..data"), "mode", "read", "exclusive", true),
4344
Map.of("path", tempDir.resolve("read_write_dir"), "mode", "read_write"),
4445
Map.of("path", tempDir.resolve("read_file"), "mode", "read"),
4546
Map.of("path", tempDir.resolve("read_write_file"), "mode", "read_write")

0 commit comments

Comments
 (0)