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

Enable license plugin to work on clients nodes 

Original commit: elastic/x-pack-elasticsearch@1b940480ae
This commit is contained in:
Igor Motov 2014-10-30 19:58:47 -04:00
parent a107b5d70a
commit feeae1956f
3 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/org/elasticsearch/license/plugin/LicensePlugin.java
View File

@ -6,6 +6,7 @@
package org.elasticsearch.license.plugin;
import org.elasticsearch.action.ActionModule;
import org.elasticsearch.client.Client;
import org.elasticsearch.cluster.metadata.MetaData;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.common.collect.ImmutableSet;
@ -32,7 +33,7 @@ import java.util.Collection;
public class LicensePlugin extends AbstractPlugin {
private final boolean isClient;
private final boolean isEnabled;
static {
MetaData.registerFactory(LicensesMetaData.TYPE, LicensesMetaData.FACTORY);
@ -40,7 +41,12 @@ public class LicensePlugin extends AbstractPlugin {
@Inject
public LicensePlugin(Settings settings) {
this.isClient = DiscoveryNode.clientNode(settings);
if (DiscoveryNode.clientNode(settings)) {
// Enable plugin only on node clients
this.isEnabled = "node".equals(settings.get(Client.CLIENT_TYPE_SETTING));
} else {
this.isEnabled = true;
}
}
@Override
@ -69,7 +75,7 @@ public class LicensePlugin extends AbstractPlugin {
@Override
public Collection<Class<? extends LifecycleComponent>> services() {
Collection<Class<? extends LifecycleComponent>> services = Lists.newArrayList();
if (!isClient) {
if (isEnabled) {
services.add(LicensesService.class);
}
return services;
@ -78,9 +84,9 @@ public class LicensePlugin extends AbstractPlugin {
@Override
public Collection<Class<? extends Module>> modules() {
if (isClient) {
return ImmutableSet.of();
if (isEnabled) {
return ImmutableSet.<Class<? extends Module>>of(LicenseModule.class);
}
return ImmutableSet.<Class<? extends Module>>of(LicenseModule.class);
return ImmutableSet.of();
}
}

4
src/main/java/org/elasticsearch/license/plugin/core/LicensesService.java
View File

@ -321,9 +321,9 @@ public class LicensesService extends AbstractLifecycleComponent<LicensesService>
protected void doStart() throws ElasticsearchException {
//Change to debug
logger.info("Started LicensesService");
if (DiscoveryNode.dataNode(settings) || DiscoveryNode.masterNode(settings)) {
// if (DiscoveryNode.dataNode(settings) || DiscoveryNode.masterNode(settings)) {
clusterService.add(this);
}
// }
}
@Override

15
src/test/java/org/elasticsearch/license/plugin/TestConsumerPlugin.java
View File

@ -5,6 +5,7 @@
*/
package org.elasticsearch.license.plugin;
import org.elasticsearch.client.Client;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.common.collect.Lists;
import org.elasticsearch.common.component.LifecycleComponent;
@ -16,14 +17,16 @@ import java.util.Collection;
public class TestConsumerPlugin extends AbstractPlugin {
private final boolean isClient;
private final Settings settings;
private final boolean isEnabled;
@Inject
public TestConsumerPlugin(Settings settings) {
this.settings = settings;
this.isClient = DiscoveryNode.clientNode(settings);
if (DiscoveryNode.clientNode(settings)) {
// Enable plugin only on node clients
this.isEnabled = "node".equals(settings.get(Client.CLIENT_TYPE_SETTING));
} else {
this.isEnabled = true;
}
}
@Override
@ -40,7 +43,7 @@ public class TestConsumerPlugin extends AbstractPlugin {
@Override
public Collection<Class<? extends LifecycleComponent>> services() {
Collection<Class<? extends LifecycleComponent>> services = Lists.newArrayList();
if (!isClient) {
if (isEnabled) {
services.add(TestPluginService.class);
}
return services;