Repository: nifi
Updated Branches:
  refs/heads/master 07a6499da -> 58fc5f24b


NIFI-1586 Removed check for distributed ZK quorum before starting the 
DatadirCleanupMananger to enable autopurge during standalone ZK server usage. 
This closes #2001


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

Branch: refs/heads/master
Commit: 58fc5f24b8f8256846b0782f17b3b090c841f94b
Parents: 07a6499
Author: Jeff Storck <[email protected]>
Authored: Fri Jul 7 18:49:59 2017 -0400
Committer: Matt Gilman <[email protected]>
Committed: Tue Jul 11 10:04:08 2017 -0400

----------------------------------------------------------------------
 .../apache/nifi/controller/state/server/ZooKeeperStateServer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/58fc5f24/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/state/server/ZooKeeperStateServer.java
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/state/server/ZooKeeperStateServer.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/state/server/ZooKeeperStateServer.java
index 6cf4f34..9db146d 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/state/server/ZooKeeperStateServer.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/state/server/ZooKeeperStateServer.java
@@ -60,7 +60,7 @@ public class ZooKeeperStateServer extends ZooKeeperServerMain 
{
             return;
         }
 
-        if (quorumPeerConfig.isDistributed() && 
quorumPeerConfig.getPurgeInterval() > 0) {
+        if (quorumPeerConfig.getPurgeInterval() > 0) {
             datadirCleanupManager = new DatadirCleanupManager(quorumPeerConfig
                     .getDataDir(), quorumPeerConfig.getDataLogDir(), 
quorumPeerConfig
                     .getSnapRetainCount(), 
quorumPeerConfig.getPurgeInterval());

Reply via email to