Skip to content

Don't attempt to install modules into test cluster more than once #121833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 5, 2025
Merged

Don't attempt to install modules into test cluster more than once #121833

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions ...sters/src/main/java/org/elasticsearch/test/cluster/local/AbstractLocalClusterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,12 @@ private void installModule(String moduleName, DefaultPluginInstallSpec installSp

});

IOUtils.syncMaybeWithLinks(modulePath, destination);
// If we aren't overriding anything we can use links here, otherwise do a full copy
if (installSpec.entitlementsOverride == null && installSpec.propertiesOverride == null) {
IOUtils.syncMaybeWithLinks(modulePath, destination);
} else {
IOUtils.syncWithCopy(modulePath, destination);
}

try {
if (installSpec.entitlementsOverride != null) {
Expand Down Expand Up @@ -794,7 +799,9 @@ private void installModule(String moduleName, DefaultPluginInstallSpec installSp
if (extendedProperty != null) {
String[] extendedModules = extendedProperty.split(",");
for (String module : extendedModules) {
installModule(module, new DefaultPluginInstallSpec(), modulePaths);
if (spec.getModules().containsKey(module) == false) {
installModule(module, new DefaultPluginInstallSpec(), modulePaths);
}
}
}
} catch (IOException e) {
Expand Down