honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 02:14:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix delete of plugin directory on remove plugin

Browse Source 
This commit fixes an issue when deleting the plugin directory while
executing the remove plugin command. Namely, we take out a file
descriptor on the plugin directory to traverse its contents to obtain
the list of files to delete. We leaked this file descriptor. On
Unix-based filesystems, this is not a problem, deleting the plugin
directory deletes the plugin directory. On Windows though, a delete is
not executed until the last file descriptor is closed. Since we leaked
this file descriptor, the plugin was not actually deleted. This led to
test failures that tried to cleanup left behind temporary directories
but these test failures were just exposing this bug. This commit fixes
this issue by ensuring that we close the file descriptor to the plugin
directory when we are finished with it.

Relates #24266
This commit is contained in:
Jason Tedor 2017-04-21 22:15:29 -04:00 committed by GitHub
parent 473e98981b
commit 9912650641
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/RemovePluginCommand.java
View File

@ -36,6 +36,8 @@ import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static org.elasticsearch.cli.Terminal.Verbosity.VERBOSE;
@ -110,7 +112,9 @@ class RemovePluginCommand extends EnvironmentAwareCommand {
* Add the contents of the plugin directory before creating the marker file and adding it to the list of paths to be deleted so
* that the marker file is the last file to be deleted.
*/
Files.list(pluginDir).forEach(pluginPaths::add);
try (Stream<Path> paths = Files.list(pluginDir)) {
pluginPaths.addAll(paths.collect(Collectors.toList()));
}
try {
Files.createFile(removing);
} catch (final FileAlreadyExistsException e) {
@ -122,9 +126,10 @@ class RemovePluginCommand extends EnvironmentAwareCommand {
}
// now add the marker file
pluginPaths.add(removing);
// finally, add the plugin directory
pluginPaths.add(pluginDir);
IOUtils.rm(pluginPaths.toArray(new Path[pluginPaths.size()]));
// at this point, the plugin directory is empty and we can execute a simple directory removal
Files.delete(pluginDir);
/*
* We preserve the config files in case the user is upgrading the plugin, but we print a