Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-6223 Expose Cluster Node Type to Controller Services 

NIFI-6223 Enhance Mock Controller Service to allow specifying node type

This closes #3444.

Signed-off-by: Bryan Bende <bbende@apache.org>
This commit is contained in:
Peter Wicks 2019-04-18 15:04:56 +00:00 committed by Bryan Bende
parent e8174fb99f
commit 2b83b7d9e8
No known key found for this signature in database
GPG Key ID: A0DDA9ED50711C39
8 changed files with 74 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nifi-api/src/main/java/org/apache/nifi/controller/AbstractControllerService.java
View File

@ -33,6 +33,7 @@ public abstract class AbstractControllerService extends AbstractConfigurableComp
private StateManager stateManager;
private volatile ConfigurationContext configurationContext;
private volatile boolean enabled = false;
private NodeTypeProvider nodeTypeProvider;
@Override
public final void initialize(final ControllerServiceInitializationContext context) throws InitializationException {
@ -40,6 +41,7 @@ public abstract class AbstractControllerService extends AbstractConfigurableComp
serviceLookup = context.getControllerServiceLookup();
logger = context.getLogger();
stateManager = context.getStateManager();
nodeTypeProvider = context.getNodeTypeProvider();
init(context);
}
@ -56,6 +58,14 @@ public abstract class AbstractControllerService extends AbstractConfigurableComp
return serviceLookup;
}
/**
* @return the {@link NodeTypeProvider} that was passed to the
* {@link #init(ControllerServiceInitializationContext)} method
*/
protected final NodeTypeProvider getNodeTypeProvider() {
return nodeTypeProvider;
}
/**
* Provides a mechanism by which subclasses can perform initialization of
* the Controller Service before it is scheduled to be run

6
nifi-api/src/main/java/org/apache/nifi/controller/ControllerServiceInitializationContext.java
View File

@ -44,4 +44,10 @@ public interface ControllerServiceInitializationContext extends KerberosContext
* @return the StateManager that can be used to store and retrieve state for this component
*/
StateManager getStateManager();
/**
* @return the {@link NodeTypeProvider} which can be used to detect the node
* type of this NiFi instance.
*/
NodeTypeProvider getNodeTypeProvider();
}

6
nifi-api/src/main/java/org/apache/nifi/documentation/init/DocumentationControllerServiceInitializationContext.java
View File

@ -19,6 +19,7 @@ package org.apache.nifi.documentation.init;
import org.apache.nifi.components.state.StateManager;
import org.apache.nifi.controller.ControllerServiceInitializationContext;
import org.apache.nifi.controller.ControllerServiceLookup;
import org.apache.nifi.controller.NodeTypeProvider;
import org.apache.nifi.logging.ComponentLog;
import java.io.File;
@ -49,6 +50,11 @@ public class DocumentationControllerServiceInitializationContext implements Cont
return new NopStateManager();
}
@Override
public NodeTypeProvider getNodeTypeProvider() {
return null;
}
@Override
public String getKerberosServicePrincipal() {
return null;

31
nifi-mock/src/main/java/org/apache/nifi/util/MockControllerServiceInitializationContext.java
View File

@ -21,14 +21,17 @@ import org.apache.nifi.components.state.StateManager;
import org.apache.nifi.controller.ControllerService;
import org.apache.nifi.controller.ControllerServiceInitializationContext;
import org.apache.nifi.controller.ControllerServiceLookup;
import org.apache.nifi.controller.NodeTypeProvider;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.state.MockStateManager;
public class MockControllerServiceInitializationContext extends MockControllerServiceLookup implements ControllerServiceInitializationContext, ControllerServiceLookup {
public class MockControllerServiceInitializationContext extends MockControllerServiceLookup implements ControllerServiceInitializationContext, ControllerServiceLookup, NodeTypeProvider {
private final String identifier;
private final ComponentLog logger;
private final StateManager stateManager;
private volatile boolean isClustered;
private volatile boolean isPrimaryNode;
public MockControllerServiceInitializationContext(final ControllerService controllerService, final String identifier) {
this(controllerService, identifier, new MockStateManager(controllerService));
@ -70,6 +73,11 @@ public class MockControllerServiceInitializationContext extends MockControllerSe
return stateManager;
}
@Override
public NodeTypeProvider getNodeTypeProvider() {
return this;
}
@Override
public String getKerberosServicePrincipal() {
return null; //this needs to be wired in.
@ -84,4 +92,25 @@ public class MockControllerServiceInitializationContext extends MockControllerSe
public File getKerberosConfigurationFile() {
return null; //this needs to be wired in.
}
@Override
public boolean isClustered() {
return isClustered;
}
@Override
public boolean isPrimary() {
return isPrimaryNode;
}
public void setClustered(boolean clustered) {
isClustered = clustered;
}
public void setPrimaryNode(boolean primaryNode) {
if (!isClustered && primaryNode) {
throw new IllegalArgumentException("Primary node is only available in cluster. Use setClustered(true) first.");
}
isPrimaryNode = primaryNode;
}
}

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/ExtensionBuilder.java
View File

@ -381,7 +381,7 @@ public class ExtensionBuilder {
final StateManager stateManager = stateManagerProvider.getStateManager(identifier);
final ControllerServiceInitializationContext initContext = new StandardControllerServiceInitializationContext(identifier, terminationAwareLogger,
serviceProvider, stateManager, kerberosConfig);
serviceProvider, stateManager, kerberosConfig, nodeTypeProvider);
serviceImpl.initialize(initContext);
final LoggableComponent<ControllerService> originalLoggableComponent = new LoggableComponent<>(serviceImpl, bundleCoordinate, terminationAwareLogger);

10
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceInitializationContext.java
View File

@ -20,6 +20,7 @@ import org.apache.nifi.components.state.StateManager;
import org.apache.nifi.controller.ControllerService;
import org.apache.nifi.controller.ControllerServiceInitializationContext;
import org.apache.nifi.controller.ControllerServiceLookup;
import org.apache.nifi.controller.NodeTypeProvider;
import org.apache.nifi.controller.kerberos.KerberosConfig;
import org.apache.nifi.logging.ComponentLog;
@ -33,16 +34,18 @@ public class StandardControllerServiceInitializationContext implements Controlle
private final ComponentLog logger;
private final StateManager stateManager;
private final KerberosConfig kerberosConfig;
private NodeTypeProvider nodeTypeProvider;
public StandardControllerServiceInitializationContext(
final String identifier, final ComponentLog logger,
final ControllerServiceProvider serviceProvider, final StateManager stateManager,
final KerberosConfig kerberosConfig) {
final KerberosConfig kerberosConfig, final NodeTypeProvider nodeTypeProvider) {
this.id = identifier;
this.logger = logger;
this.serviceProvider = serviceProvider;
this.stateManager = stateManager;
this.kerberosConfig = kerberosConfig;
this.nodeTypeProvider = nodeTypeProvider;
}
@Override
@ -95,6 +98,11 @@ public class StandardControllerServiceInitializationContext implements Controlle
return stateManager;
}
@Override
public NodeTypeProvider getNodeTypeProvider() {
return nodeTypeProvider;
}
@Override
public String getKerberosServicePrincipal() {
return kerberosConfig.getPrincipal();

6
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/mock/MockControllerServiceInitializationContext.java
View File

@ -19,6 +19,7 @@ package org.apache.nifi.mock;
import org.apache.nifi.components.state.StateManager;
import org.apache.nifi.controller.ControllerServiceInitializationContext;
import org.apache.nifi.controller.ControllerServiceLookup;
import org.apache.nifi.controller.NodeTypeProvider;
import org.apache.nifi.logging.ComponentLog;
import java.io.File;
@ -51,6 +52,11 @@ public class MockControllerServiceInitializationContext implements ControllerSer
return null;
}
@Override
public NodeTypeProvider getNodeTypeProvider() {
return null;
}
@Override
public String getKerberosServicePrincipal() {
return null;

6
nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/lookup/script/BaseScriptedLookupService.java
View File

@ -26,6 +26,7 @@ import org.apache.nifi.components.state.StateManager;
import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.controller.ControllerServiceInitializationContext;
import org.apache.nifi.controller.ControllerServiceLookup;
import org.apache.nifi.controller.NodeTypeProvider;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.lookup.LookupService;
@ -314,6 +315,11 @@ public class BaseScriptedLookupService extends AbstractScriptedControllerService
return BaseScriptedLookupService.this.getStateManager();
}
@Override
public NodeTypeProvider getNodeTypeProvider() {
return BaseScriptedLookupService.this.getNodeTypeProvider();
}
@Override
public ControllerServiceLookup getControllerServiceLookup() {
return BaseScriptedLookupService.super.getControllerServiceLookup();