honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mandatory-plugins' of https://github.com/Paikan/elasticsearch

This commit is contained in:
Shay Banon 2012-02-18 21:04:17 +02:00
parent 897f67ade8 017f48a187
commit 112f63ce85
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/elasticsearch.yml
View File

@ -82,11 +82,11 @@
# #
# node.rack: rack314 # node.rack: rack314
# By default, multiple nodes are allowed to start from the same installation location # By default, multiple nodes are allowed to start from the same installation location
# to disable it, set the following: # to disable it, set the following:
# node.max_local_storage_nodes: 1 # node.max_local_storage_nodes: 1
#################################### Index #################################### #################################### Index ####################################
# You can set a number of options (such as shard/replica options, mapping # You can set a number of options (such as shard/replica options, mapping
@ -165,6 +165,13 @@
# path.plugins: /path/to/plugins # path.plugins: /path/to/plugins
#################################### Plugin ###################################
# If a plugin listed here is not installed for current node, the node will not start.
#
# plugin.mandatory: mapper-attachments,lang-groovy
################################### Memory #################################### ################################### Memory ####################################
# ElasticSearch performs poorly when JVM starts swapping: you should ensure that # ElasticSearch performs poorly when JVM starts swapping: you should ensure that

16
src/main/java/org/elasticsearch/plugins/PluginsService.java
View File

@ -74,8 +74,22 @@ public class PluginsService extends AbstractComponent {
// first, find all the ones that are in the classpath // first, find all the ones that are in the classpath
Map<String, Plugin> plugins = Maps.newHashMap(); Map<String, Plugin> plugins = Maps.newHashMap();
plugins.putAll(loadPluginsFromClasspath(settings)); plugins.putAll(loadPluginsFromClasspath(settings));
Set<String> sitePlugins = sitePlugins();
logger.info("loaded {}, sites {}", plugins.keySet(), sitePlugins()); String[] mandatoryPlugins = settings.getAsArray("plugin.mandatory", null);
if (mandatoryPlugins != null) {
Set<String> missingPlugins = Sets.newHashSet();
for (String mandatoryPlugin : mandatoryPlugins) {
if (!plugins.containsKey(mandatoryPlugin) && !sitePlugins.contains(mandatoryPlugin) && !missingPlugins.contains(mandatoryPlugin)) {
missingPlugins.add(mandatoryPlugin);
}
}
if (!missingPlugins.isEmpty()) {
throw new ElasticSearchException("Missing mandatory plugins " + missingPlugins);
}
}
logger.info("loaded {}, sites {}", plugins.keySet(), sitePlugins);
this.plugins = ImmutableMap.copyOf(plugins); this.plugins = ImmutableMap.copyOf(plugins);