You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/03/31 22:11:25 UTC

[1/7] incubator-nifi git commit: NIFI-464 This closes #45 (minor revision - replace hard coded constant with length)

Repository: incubator-nifi
Updated Branches:
  refs/heads/NIFI-250 97632fbce -> 266d44b11


NIFI-464 This closes #45 (minor revision - replace hard coded constant
with length)


Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/3a27c378
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/3a27c378
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/3a27c378

Branch: refs/heads/NIFI-250
Commit: 3a27c378cc143abc5e59dfb746c5e0d09341b185
Parents: a5e140f
Author: Tony Kurc <tr...@gmail.com>
Authored: Wed Mar 25 21:52:23 2015 -0400
Committer: Tony Kurc <tr...@gmail.com>
Committed: Wed Mar 25 23:10:36 2015 -0400

----------------------------------------------------------------------
 .../apache/nifi/distributed/cache/protocol/ProtocolHandshake.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3a27c378/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-protocol/src/main/java/org/apache/nifi/distributed/cache/protocol/ProtocolHandshake.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-protocol/src/main/java/org/apache/nifi/distributed/cache/protocol/ProtocolHandshake.java b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-protocol/src/main/java/org/apache/nifi/distributed/cache/protocol/ProtocolHandshake.java
index da2acad..55cf51f 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-protocol/src/main/java/org/apache/nifi/distributed/cache/protocol/ProtocolHandshake.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-protocol/src/main/java/org/apache/nifi/distributed/cache/protocol/ProtocolHandshake.java
@@ -53,7 +53,7 @@ public class ProtocolHandshake {
         final DataOutputStream dos = new DataOutputStream(out);
         
         try {
-            final byte[] magicHeaderBuffer = new byte[4];
+            final byte[] magicHeaderBuffer = new byte[MAGIC_HEADER.length];
             dis.readFully(magicHeaderBuffer);
             
             receiveVersionNegotiation(versionNegotiator, dis, dos);


[6/7] incubator-nifi git commit: Merge branch 'rep3' into develop

Posted by mc...@apache.org.
Merge branch 'rep3' into develop


Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/e7d6d945
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/e7d6d945
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/e7d6d945

Branch: refs/heads/NIFI-250
Commit: e7d6d94584b3f04e709eeaba532f142d11d75b39
Parents: ed5fd73 ac409fd
Author: Brandon DeVries <br...@gmail.com>
Authored: Mon Mar 30 12:14:20 2015 -0400
Committer: Brandon DeVries <br...@gmail.com>
Committed: Mon Mar 30 12:14:20 2015 -0400

----------------------------------------------------------------------
 .../StandardControllerServiceProvider.java      |  6 ++
 .../StandardControllerServiceProviderTest.java  | 71 ++++++++++++++++++++
 .../service/util/TestControllerService.java     | 61 +++++++++++++++++
 ...org.apache.nifi.controller.ControllerService | 15 +++++
 4 files changed, 153 insertions(+)
----------------------------------------------------------------------



[2/7] incubator-nifi git commit: NIFI-443: If a funnel is given an incoming connection but has no outgoing connection, it continually runs and fails, logging a lot of ERROR messages

Posted by mc...@apache.org.
NIFI-443: If a funnel is given an incoming connection but has no outgoing connection, it continually runs and fails, logging a lot of ERROR messages


Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/42a4f902
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/42a4f902
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/42a4f902

Branch: refs/heads/NIFI-250
Commit: 42a4f9024262c2b6e1871d6406e81ba72695f9ab
Parents: 3a27c37
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Mar 27 14:46:20 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri Mar 27 14:46:20 2015 -0400

----------------------------------------------------------------------
 .../nifi/controller/tasks/ContinuallyRunConnectableTask.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/42a4f902/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunConnectableTask.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunConnectableTask.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunConnectableTask.java
index 408032c..a1219a4 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunConnectableTask.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunConnectableTask.java
@@ -21,6 +21,7 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.nifi.annotation.lifecycle.OnStopped;
 import org.apache.nifi.connectable.Connectable;
+import org.apache.nifi.connectable.ConnectableType;
 import org.apache.nifi.controller.repository.StandardProcessSessionFactory;
 import org.apache.nifi.controller.scheduling.ProcessContextFactory;
 import org.apache.nifi.controller.scheduling.ScheduleState;
@@ -69,7 +70,9 @@ public class ContinuallyRunConnectableTask implements Callable<Boolean> {
         final boolean triggerWhenEmpty = connectable.isTriggerWhenEmpty();
         boolean flowFilesQueued = true;
         final boolean shouldRun = (connectable.getYieldExpiration() < System.currentTimeMillis())
-                && (triggerWhenEmpty || (flowFilesQueued = Connectables.flowFilesQueued(connectable))) && (connectable.getRelationships().isEmpty() || Connectables.anyRelationshipAvailable(connectable));
+                && (triggerWhenEmpty || (flowFilesQueued = Connectables.flowFilesQueued(connectable)))
+                && (connectable.getConnectableType() != ConnectableType.FUNNEL || !connectable.getConnections().isEmpty())
+                && (connectable.getRelationships().isEmpty() || Connectables.anyRelationshipAvailable(connectable));
 
         if (shouldRun) {
             scheduleState.incrementActiveThreadCount();


[3/7] incubator-nifi git commit: NIFI-443: Fixed out-of-date comments/documentation

Posted by mc...@apache.org.
NIFI-443: Fixed out-of-date comments/documentation


Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/909ded32
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/909ded32
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/909ded32

Branch: refs/heads/NIFI-250
Commit: 909ded32aaa4cc5f70b162792e9a4216357826e1
Parents: 42a4f90
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Mar 27 15:06:11 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri Mar 27 15:06:11 2015 -0400

----------------------------------------------------------------------
 .../controller/tasks/ContinuallyRunConnectableTask.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/909ded32/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunConnectableTask.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunConnectableTask.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunConnectableTask.java
index a1219a4..b5b60c9 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunConnectableTask.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunConnectableTask.java
@@ -62,11 +62,11 @@ public class ContinuallyRunConnectableTask implements Callable<Boolean> {
         }
         
         // Connectable should run if the following conditions are met:
-        // 1. It's an Input Port or or is a Remote Input Port or has incoming FlowFiles queued
-        // 2. Any relationship is available (since there's only 1
-        // relationship for a Connectable, we can say "any" or "all" and
-        // it means the same thing)
-        // 3. It is not yielded.
+        // 1. It is not yielded.
+        // 2. It has incoming connections with FlowFiles queued or doesn't expect incoming connections
+        // 3. If it is a funnel, it has an outgoing connection (this is needed because funnels are "always on"; other
+        //    connectable components cannot even be started if they need an outbound connection and don't have one)
+        // 4. There is a connection for each relationship.
         final boolean triggerWhenEmpty = connectable.isTriggerWhenEmpty();
         boolean flowFilesQueued = true;
         final boolean shouldRun = (connectable.getYieldExpiration() < System.currentTimeMillis())


[7/7] incubator-nifi git commit: Merge branch 'develop' into NIFI-250

Posted by mc...@apache.org.
Merge branch 'develop' into NIFI-250


Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/266d44b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/266d44b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/266d44b1

Branch: refs/heads/NIFI-250
Commit: 266d44b11c92cea51f882483adcfa898feeaac44
Parents: 97632fb e7d6d94
Author: Matt Gilman <ma...@gmail.com>
Authored: Tue Mar 31 16:11:12 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Tue Mar 31 16:11:12 2015 -0400

----------------------------------------------------------------------
 .../src/main/asciidoc/administration-guide.adoc | 21 ++++--
 .../StandardControllerServiceProvider.java      |  6 ++
 .../tasks/ContinuallyRunConnectableTask.java    | 15 +++--
 .../StandardControllerServiceProviderTest.java  | 71 ++++++++++++++++++++
 .../service/util/TestControllerService.java     | 61 +++++++++++++++++
 ...org.apache.nifi.controller.ControllerService | 15 +++++
 .../cache/protocol/ProtocolHandshake.java       |  2 +-
 7 files changed, 180 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/266d44b1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
----------------------------------------------------------------------
diff --cc nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
index 1e64223,7a8e22f..dfbfca5
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
@@@ -137,10 -117,14 +137,16 @@@ public class StandardControllerServiceP
              final InvocationHandler invocationHandler = new InvocationHandler() {
                  @Override
                  public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
+ 
+                 	final String methodName = method.getName();
+                 	if("initialize".equals(methodName) || "onPropertyModified".equals(methodName)){
+                 		throw new UnsupportedOperationException(method + " may only be invoked by the NiFi framework");
+                 	}
+                 	
                      final ControllerServiceNode node = serviceNodeHolder.get();
 -                    if (node.isDisabled() && !validDisabledMethods.contains(method)) {
 +                    final ControllerServiceState state = node.getState();
 +                    final boolean disabled = (state != ControllerServiceState.ENABLED); // only allow method call if service state is ENABLED.
 +                    if (disabled && !validDisabledMethods.contains(method)) {
                          // Use nar class loader here because we are implicitly calling toString() on the original implementation.
                          try (final NarCloseable narCloseable = NarCloseable.withNarLoader()) {
                              throw new IllegalStateException("Cannot invoke method " + method + " on Controller Service " + originalService + " because the Controller Service is disabled");


[4/7] incubator-nifi git commit: NIFI-422 Updated Clustering Configuration section to account for some missing details; added short troubleshooting section.

Posted by mc...@apache.org.
NIFI-422 Updated Clustering Configuration section to account for some missing details; added short troubleshooting section.

Signed-off-by: joewitt <jo...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/ed5fd733
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/ed5fd733
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/ed5fd733

Branch: refs/heads/NIFI-250
Commit: ed5fd733d8a80b5adbaed7389e9369c192a6f07b
Parents: 909ded3
Author: Jenn Barnabee <je...@gmail.com>
Authored: Mon Mar 23 05:57:08 2015 -0400
Committer: joewitt <jo...@apache.org>
Committed: Mon Mar 30 08:55:28 2015 -0400

----------------------------------------------------------------------
 .../src/main/asciidoc/administration-guide.adoc | 21 ++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ed5fd733/nifi/nifi-docs/src/main/asciidoc/administration-guide.adoc
----------------------------------------------------------------------
diff --git a/nifi/nifi-docs/src/main/asciidoc/administration-guide.adoc b/nifi/nifi-docs/src/main/asciidoc/administration-guide.adoc
index 96dd423..d33b4de 100644
--- a/nifi/nifi-docs/src/main/asciidoc/administration-guide.adoc
+++ b/nifi/nifi-docs/src/main/asciidoc/administration-guide.adoc
@@ -229,7 +229,7 @@ When the DFM makes changes to the dataflow, the NCM communicates those changes t
 
 *Dealing with Disconnected Nodes* +
 
-A DFM may manually disconnect a node from the cluster. But if a node becomes disconnected for any other reason (such as due to lack of heartbeat), the NCM will show a bulletin on the User Interface, and the DFM will not be able to make any changes to the dataflow until the issue of the disconnected node is resolved. The DFM or the Administrator will need to troubleshoot the issue with the node and resolve it before any new changes may be made to the dataflow. However, it is worth noting that just because a node is disconnected does not mean that it is definitely down; it just means that the NCM cannot communicate with the node.
+A DFM may manually disconnect a node from the cluster. But if a node becomes disconnected for any other reason (such as due to lack of heartbeat), the NCM will show a bulletin on the User Interface, and the DFM will not be able to make any changes to the dataflow until the issue of the disconnected node is resolved. The DFM or the Administrator will need to troubleshoot the issue with the node and resolve it before any new changes may be made to the dataflow. However, it is worth noting that just because a node is disconnected does not mean that it is not working; it just means that the NCM cannot communicate with the node.
  
 
 *Basic Cluster Setup* +
@@ -242,7 +242,7 @@ This section describes the setup for a simple two-node, non-secure, unicast clus
 
 Administrators may install each instance on a separate server; however, it is also perfectly fine to install the NCM and one of the nodes on the same server, as the NCM is very lightweight. Just keep in mind that the ports assigned to each instance must not collide if the NCM and one of the nodes share the same server.
 
-For each instance, the clustering properties in the _nifi.properties_ file will need to be updated. All the clustering properties are described in the <<system_properties>> section of this guide; however, in this section, we will focus on the minimum properties that must be set for simple cluster. 
+For each instance, certain properties in the _nifi.properties_ file will need to be updated. In particular, the Web and Clustering properties should be evaluated for your situation and adjusted accordingly. All the properties are described in the <<system_properties>> section of this guide; however, in this section, we will focus on the minimum properties that must be set for a simple cluster. 
 
 For all three instances, the Cluster Common Properties can be left with the default settings. Note, however, that if you change these settings, they must be set the same on every instance in the cluster (NCM and nodes).
 
@@ -255,18 +255,20 @@ For the NCM, the minimum properties to configure are as follows:
 
 For Node 1, the minimum properties to configure are as follows:
 
-* Under the Web Properties, set either the http or https port that you want Node 1 to run on. If the NCM is running on the same server, choose a different web port for Node 1.
+* Under the Web Properties, set either the http or https port that you want Node 1 to run on. If the NCM is running on the same server, choose a different web port for Node 1. Also, consider whether you need to set the http or https host property.
 * Under Cluster Node Properties, set the following:
 ** nifi.cluster.is.node - Set this to _true_.
+** nifi.cluster.node.address - Set this to the fully qualified hostname of the node. If left blank, it defaults to "localhost".
 ** nifi.cluster.node.protocol.port - Set this to an open port that is higher than 1024 (anything lower requires root). If Node 1 and the NCM are on the same server, make sure this port is different from the nifi.cluster.protocol.manager.port.
 ** nifi.cluster.node.unicast.manager.address - Set this to the NCM's fully qualified hostname.  
 ** nifi.cluster.node.unicast.manager.protocol.port - Set this to exactly the same port that was set on the NCM for the property nifi.cluster.manager.protocol.port.
 
 For Node 2, the minimum properties to configure are as follows:
 
-* Under the Web Properties, set either the http or https port that you want Node 2 to run on.
+* Under the Web Properties, set either the http or https port that you want Node 2 to run on. Also, consider whether you need to set the http or https host property.
 * Under the Cluster Node Properties, set the following:
 ** nifi.cluster.is.node - Set this to _true_.
+** nifi.cluster.node.address - Set this to the fully qualified hostname of the node. If left blank, it defaults to "localhost".
 ** nifi.cluster.node.protocol.port - Set this to an open port that is higher than 1024 (anything lower requires root).
 ** nifi.cluster.node.unicast.manager.address - Set this to the NCM's fully qualified hostname.
 ** nifi.cluster.node.unicast.manager.protocol.port - Set this to exactly the same port that was set on the NCM for the property nifi.cluster.manager.protocol.port.
@@ -275,6 +277,17 @@ Now, it is possible to start up the cluster. Technically, it does not matter whi
 
 image:ncm.png["NCM User Interface", width=940] 
 
+*Troubleshooting*
+
+If you encounter issues and your cluster does not work as described, investigate the nifi.app log and nifi.user log on both the NCM and the nodes. If needed, you can change the logging level to DEBUG by editing the conf/logback.xml file. Specifically, set the level="DEBUG" in the following line (instead of "INFO"):
+
+----
+    <logger name="org.apache.nifi.web.api.config" level="INFO"
+additivity="false">
+        <appender-ref ref="USER_FILE"/>
+    </logger>
+----
+
 
 
 [[system_properties]]


[5/7] incubator-nifi git commit: NIFI-424 Processors / Controller Services should not be able to directly call ControllerService.initialize and ControllerService.onPropertyModified

Posted by mc...@apache.org.
NIFI-424
Processors / Controller Services should not be able to directly call ControllerService.initialize and ControllerService.onPropertyModified


Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/ac409fd6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/ac409fd6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/ac409fd6

Branch: refs/heads/NIFI-250
Commit: ac409fd69aefedbfa72f90d1647da4309cf46dfc
Parents: 3a27c37
Author: Brandon DeVries <br...@gmail.com>
Authored: Mon Mar 30 12:11:15 2015 -0400
Committer: Brandon DeVries <br...@gmail.com>
Committed: Mon Mar 30 12:11:15 2015 -0400

----------------------------------------------------------------------
 .../StandardControllerServiceProvider.java      |  6 ++
 .../StandardControllerServiceProviderTest.java  | 71 ++++++++++++++++++++
 .../service/util/TestControllerService.java     | 61 +++++++++++++++++
 ...org.apache.nifi.controller.ControllerService | 15 +++++
 4 files changed, 153 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ac409fd6/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
index a40e43e..7a8e22f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
@@ -117,6 +117,12 @@ public class StandardControllerServiceProvider implements ControllerServiceProvi
             final InvocationHandler invocationHandler = new InvocationHandler() {
                 @Override
                 public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
+
+                	final String methodName = method.getName();
+                	if("initialize".equals(methodName) || "onPropertyModified".equals(methodName)){
+                		throw new UnsupportedOperationException(method + " may only be invoked by the NiFi framework");
+                	}
+                	
                     final ControllerServiceNode node = serviceNodeHolder.get();
                     if (node.isDisabled() && !validDisabledMethods.contains(method)) {
                         // Use nar class loader here because we are implicitly calling toString() on the original implementation.

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ac409fd6/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/service/StandardControllerServiceProviderTest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/service/StandardControllerServiceProviderTest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/service/StandardControllerServiceProviderTest.java
new file mode 100644
index 0000000..b889bc8
--- /dev/null
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/service/StandardControllerServiceProviderTest.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.nifi.controller.service;
+
+import org.apache.nifi.controller.ControllerService;
+import org.apache.nifi.controller.StandardFlowServiceTest;
+import org.apache.nifi.nar.ExtensionManager;
+import org.apache.nifi.nar.NarClassLoaders;
+import org.apache.nifi.reporting.InitializationException;
+import org.apache.nifi.util.NiFiProperties;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class StandardControllerServiceProviderTest {
+	
+    private ControllerService proxied;
+    private ControllerService implementation;
+    
+    @BeforeClass
+    public static void setupSuite() throws Exception {
+        System.setProperty(NiFiProperties.PROPERTIES_FILE_PATH, StandardFlowServiceTest.class.getResource("/conf/nifi.properties").getFile());
+        NiFiProperties properties = NiFiProperties.getInstance();
+        NarClassLoaders.load(properties);
+    	ExtensionManager.discoverExtensions();
+    }
+
+    @Before
+    public void setup() throws Exception {
+    	String id = "id";
+    	String clazz = "org.apache.nifi.controller.service.util.TestControllerService";  
+    	ControllerServiceProvider provider = new StandardControllerServiceProvider();
+    	ControllerServiceNode node = provider.createControllerService(clazz,id,true);
+    	proxied = node.getProxiedControllerService();
+    	implementation = node.getControllerServiceImplementation();
+    }
+	
+    @Test (expected=UnsupportedOperationException.class)
+    public void testCallProxiedOnPropertyModified() {	
+		proxied.onPropertyModified(null, "oldValue", "newValue");
+    }
+    
+    @Test
+    public void testCallImplementationOnPropertyModified() {	
+    	implementation.onPropertyModified(null, "oldValue", "newValue");
+    }
+    
+    @Test (expected=UnsupportedOperationException.class)
+    public void testCallProxiedInitialized() throws InitializationException {	
+		proxied.initialize(null);
+    }
+    
+    @Test
+    public void testCallImplementationInitialized() throws InitializationException {	
+    	implementation.initialize(null);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ac409fd6/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/service/util/TestControllerService.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/service/util/TestControllerService.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/service/util/TestControllerService.java
new file mode 100644
index 0000000..95200a0
--- /dev/null
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/service/util/TestControllerService.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.nifi.controller.service.util;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.ValidationContext;
+import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.controller.ControllerService;
+import org.apache.nifi.controller.ControllerServiceInitializationContext;
+import org.apache.nifi.reporting.InitializationException;
+
+public class TestControllerService implements ControllerService {
+
+	@Override
+	public Collection<ValidationResult> validate(ValidationContext context) {
+		return null;
+	}
+
+	@Override
+	public PropertyDescriptor getPropertyDescriptor(String name) {
+		return null;
+	}
+
+	@Override
+	public void onPropertyModified(PropertyDescriptor descriptor,
+			String oldValue, String newValue) {
+	}
+
+	@Override
+	public List<PropertyDescriptor> getPropertyDescriptors() {
+		return null;
+	}
+
+	@Override
+	public String getIdentifier() {
+		return null;
+	}
+
+	@Override
+	public void initialize(ControllerServiceInitializationContext context)
+			throws InitializationException {
+	}
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ac409fd6/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/resources/META-INF/services/org.apache.nifi.controller.ControllerService
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/resources/META-INF/services/org.apache.nifi.controller.ControllerService b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/resources/META-INF/services/org.apache.nifi.controller.ControllerService
new file mode 100644
index 0000000..bd6a4f3
--- /dev/null
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/resources/META-INF/services/org.apache.nifi.controller.ControllerService
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+org.apache.nifi.controller.service.util.TestControllerService