You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/03/18 15:11:08 UTC
[1/2] incubator-nifi git commit: NIFI-432: Reduced amount of time
needed for rollovers in unit tests in order to speed up tests
Repository: incubator-nifi
Updated Branches:
refs/heads/develop c118ead0b -> e569af60f
NIFI-432: Reduced amount of time needed for rollovers in unit tests in order to speed up tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/b560a88c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/b560a88c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/b560a88c
Branch: refs/heads/develop
Commit: b560a88cbde48e669cee89e2c6cb18fcae736c72
Parents: 7198912
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Mar 18 10:10:21 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Wed Mar 18 10:10:21 2015 -0400
----------------------------------------------------------------------
.../PersistentProvenanceRepository.java | 10 +++--
.../TestPersistentProvenanceRepository.java | 40 ++++++++++----------
2 files changed, 26 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b560a88c/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java
index f46b5fc..0502cc7 100644
--- a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java
+++ b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java
@@ -130,6 +130,7 @@ public class PersistentProvenanceRepository implements ProvenanceEventRepository
private final RepositoryConfiguration configuration;
private final IndexConfiguration indexConfig;
private final boolean alwaysSync;
+ private final int rolloverCheckMillis;
private final ScheduledExecutorService scheduledExecService;
private final ExecutorService rolloverExecutor;
@@ -156,10 +157,10 @@ public class PersistentProvenanceRepository implements ProvenanceEventRepository
private EventReporter eventReporter;
public PersistentProvenanceRepository() throws IOException {
- this(createRepositoryConfiguration());
+ this(createRepositoryConfiguration(), 10000);
}
- public PersistentProvenanceRepository(final RepositoryConfiguration configuration) throws IOException {
+ public PersistentProvenanceRepository(final RepositoryConfiguration configuration, final int rolloverCheckMillis) throws IOException {
if (configuration.getStorageDirectories().isEmpty()) {
throw new IllegalArgumentException("Must specify at least one storage directory");
}
@@ -181,7 +182,8 @@ public class PersistentProvenanceRepository implements ProvenanceEventRepository
this.maxPartitionBytes = configuration.getMaxEventFileCapacity();
this.indexConfig = new IndexConfiguration(configuration);
this.alwaysSync = configuration.isAlwaysSync();
-
+ this.rolloverCheckMillis = rolloverCheckMillis;
+
final List<SearchableField> fields = configuration.getSearchableFields();
if (fields != null && !fields.isEmpty()) {
indexingAction = new IndexingAction(this, indexConfig);
@@ -244,7 +246,7 @@ public class PersistentProvenanceRepository implements ProvenanceEventRepository
}
}
}
- }, 10L, 10L, TimeUnit.SECONDS);
+ }, rolloverCheckMillis, rolloverCheckMillis, TimeUnit.MILLISECONDS);
scheduledExecService.scheduleWithFixedDelay(new RemoveExpiredQueryResults(), 30L, 3L, TimeUnit.SECONDS);
scheduledExecService.scheduleWithFixedDelay(new Runnable() {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b560a88c/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java
index 7305872..75e3514 100644
--- a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java
+++ b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java
@@ -170,7 +170,7 @@ public class TestPersistentProvenanceRepository {
config.setCompressOnRollover(false);
config.setJournalCount(10);
config.setQueryThreadPoolSize(10);
- repo = new PersistentProvenanceRepository(config);
+ repo = new PersistentProvenanceRepository(config, 75);
repo.initialize(getEventReporter());
final Map<String, String> attributes = new HashMap<>();
@@ -218,7 +218,7 @@ public class TestPersistentProvenanceRepository {
System.out.println("Closing and re-initializing");
repo.close();
- repo = new PersistentProvenanceRepository(config);
+ repo = new PersistentProvenanceRepository(config, 75);
repo.initialize(getEventReporter());
System.out.println("Re-initialized");
@@ -238,7 +238,7 @@ public class TestPersistentProvenanceRepository {
final RepositoryConfiguration config = createConfiguration();
config.setMaxEventFileCapacity(1L);
config.setMaxEventFileLife(1, TimeUnit.SECONDS);
- repo = new PersistentProvenanceRepository(config);
+ repo = new PersistentProvenanceRepository(config, 75);
repo.initialize(getEventReporter());
final Map<String, String> attributes = new HashMap<>();
@@ -262,7 +262,7 @@ public class TestPersistentProvenanceRepository {
repo.close();
Thread.sleep(500L); // Give the repo time to shutdown (i.e., close all file handles, etc.)
- repo = new PersistentProvenanceRepository(config);
+ repo = new PersistentProvenanceRepository(config, 75);
repo.initialize(getEventReporter());
final List<ProvenanceEventRecord> recoveredRecords = repo.getEvents(0L, 12);
@@ -285,7 +285,7 @@ public class TestPersistentProvenanceRepository {
config.setMaxEventFileCapacity(1024L * 1024L);
config.setMaxEventFileLife(2, TimeUnit.SECONDS);
config.setSearchableFields(searchableFields);
- repo = new PersistentProvenanceRepository(config);
+ repo = new PersistentProvenanceRepository(config, 75);
repo.initialize(getEventReporter());
final Map<String, String> attributes = new HashMap<>();
@@ -339,7 +339,7 @@ public class TestPersistentProvenanceRepository {
final RepositoryConfiguration config = createConfiguration();
config.setMaxEventFileLife(500, TimeUnit.MILLISECONDS);
config.setSearchableFields(new ArrayList<>(SearchableFields.getStandardFields()));
- repo = new PersistentProvenanceRepository(config);
+ repo = new PersistentProvenanceRepository(config, 75);
repo.initialize(getEventReporter());
final String uuid = "00000000-0000-0000-0000-000000000000";
@@ -383,7 +383,7 @@ public class TestPersistentProvenanceRepository {
final RepositoryConfiguration config = createConfiguration();
config.setMaxEventFileLife(500, TimeUnit.MILLISECONDS);
config.setCompressOnRollover(true);
- repo = new PersistentProvenanceRepository(config);
+ repo = new PersistentProvenanceRepository(config, 75);
repo.initialize(getEventReporter());
final String uuid = "00000000-0000-0000-0000-000000000000";
@@ -421,7 +421,7 @@ public class TestPersistentProvenanceRepository {
config.setMaxEventFileCapacity(1024L * 1024L);
config.setSearchableFields(new ArrayList<>(SearchableFields.getStandardFields()));
- repo = new PersistentProvenanceRepository(config);
+ repo = new PersistentProvenanceRepository(config, 75);
repo.initialize(getEventReporter());
final String uuid = "10000000-0000-0000-0000-000000000000";
@@ -480,7 +480,7 @@ public class TestPersistentProvenanceRepository {
config.setMaxEventFileCapacity(1024L * 1024L);
config.setSearchableFields(new ArrayList<>(SearchableFields.getStandardFields()));
- repo = new PersistentProvenanceRepository(config);
+ repo = new PersistentProvenanceRepository(config, 75);
repo.initialize(getEventReporter());
final String uuid = "00000000-0000-0000-0000-000000000000";
@@ -543,7 +543,7 @@ public class TestPersistentProvenanceRepository {
config.setMaxEventFileCapacity(1024L * 1024L);
config.setSearchableFields(new ArrayList<>(SearchableFields.getStandardFields()));
- repo = new PersistentProvenanceRepository(config);
+ repo = new PersistentProvenanceRepository(config, 75);
repo.initialize(getEventReporter());
final String uuid = "00000000-0000-0000-0000-000000000000";
@@ -625,7 +625,7 @@ public class TestPersistentProvenanceRepository {
config.setMaxEventFileCapacity(1024L * 1024L);
config.setSearchableFields(new ArrayList<>(SearchableFields.getStandardFields()));
- repo = new PersistentProvenanceRepository(config);
+ repo = new PersistentProvenanceRepository(config, 75);
repo.initialize(getEventReporter());
final String uuid = "00000000-0000-0000-0000-000000000000";
@@ -681,7 +681,7 @@ public class TestPersistentProvenanceRepository {
config.setMaxEventFileCapacity(1024L * 1024L);
config.setSearchableFields(new ArrayList<>(SearchableFields.getStandardFields()));
- repo = new PersistentProvenanceRepository(config);
+ repo = new PersistentProvenanceRepository(config, 75);
repo.initialize(getEventReporter());
final String uuid = "00000000-0000-0000-0000-000000000001";
@@ -736,7 +736,7 @@ public class TestPersistentProvenanceRepository {
config.setMaxEventFileCapacity(1024L * 1024L);
config.setSearchableFields(new ArrayList<>(SearchableFields.getStandardFields()));
- repo = new PersistentProvenanceRepository(config);
+ repo = new PersistentProvenanceRepository(config, 75);
repo.initialize(getEventReporter());
final String uuid = "00000000-0000-0000-0000-000000000001";
@@ -795,7 +795,7 @@ public class TestPersistentProvenanceRepository {
config.setMaxEventFileCapacity(1024L * 1024L);
config.setSearchableFields(new ArrayList<>(SearchableFields.getStandardFields()));
- repo = new PersistentProvenanceRepository(config);
+ repo = new PersistentProvenanceRepository(config, 75);
repo.initialize(getEventReporter());
final String childId = "00000000-0000-0000-0000-000000000000";
@@ -845,7 +845,7 @@ public class TestPersistentProvenanceRepository {
config.setMaxEventFileCapacity(1024L * 1024L);
config.setSearchableFields(new ArrayList<>(SearchableFields.getStandardFields()));
- repo = new PersistentProvenanceRepository(config);
+ repo = new PersistentProvenanceRepository(config, 75);
repo.initialize(getEventReporter());
final String childId = "00000000-0000-0000-0000-000000000000";
@@ -892,7 +892,7 @@ public class TestPersistentProvenanceRepository {
public void testCorrectProvenanceEventIdOnRestore() throws IOException {
final RepositoryConfiguration config = createConfiguration();
config.setMaxEventFileLife(1, TimeUnit.SECONDS);
- repo = new PersistentProvenanceRepository(config);
+ repo = new PersistentProvenanceRepository(config, 75);
repo.initialize(getEventReporter());
final String uuid = "00000000-0000-0000-0000-000000000000";
@@ -918,7 +918,7 @@ public class TestPersistentProvenanceRepository {
repo.close();
- final PersistentProvenanceRepository secondRepo = new PersistentProvenanceRepository(config);
+ final PersistentProvenanceRepository secondRepo = new PersistentProvenanceRepository(config, 75);
secondRepo.initialize(getEventReporter());
final ProvenanceEventRecord event11 = builder.build();
@@ -938,7 +938,7 @@ public class TestPersistentProvenanceRepository {
config.setMaxEventFileCapacity(1024L * 1024L);
config.setSearchableFields(new ArrayList<>(SearchableFields.getStandardFields()));
- repo = new PersistentProvenanceRepository(config);
+ repo = new PersistentProvenanceRepository(config, 75);
repo.initialize(getEventReporter());
final String uuid = "00000000-0000-0000-0000-000000000000";
@@ -1002,7 +1002,7 @@ public class TestPersistentProvenanceRepository {
final RepositoryConfiguration config = createConfiguration();
config.setMaxEventFileLife(500, TimeUnit.MILLISECONDS);
config.setSearchableFields(new ArrayList<>(SearchableFields.getStandardFields()));
- repo = new PersistentProvenanceRepository(config);
+ repo = new PersistentProvenanceRepository(config, 75);
repo.initialize(getEventReporter());
final String uuid = "00000000-0000-0000-0000-000000000000";
@@ -1070,7 +1070,7 @@ public class TestPersistentProvenanceRepository {
public void testMergeJournals() throws IOException, InterruptedException {
final RepositoryConfiguration config = createConfiguration();
config.setMaxEventFileLife(3, TimeUnit.SECONDS);
- repo = new PersistentProvenanceRepository(config);
+ repo = new PersistentProvenanceRepository(config, 75);
repo.initialize(getEventReporter());
final Map<String, String> attributes = new HashMap<>();
[2/2] incubator-nifi git commit: Merge branch 'develop' of
http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Posted by ma...@apache.org.
Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi 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/e569af60
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/e569af60
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/e569af60
Branch: refs/heads/develop
Commit: e569af60f4c841c91762338d4d1d4b14a614fa91
Parents: b560a88 c118ead
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Mar 18 10:10:49 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Wed Mar 18 10:10:49 2015 -0400
----------------------------------------------------------------------
nifi/NOTICE | 5 -
nifi/nifi-api/pom.xml | 2 +-
nifi/nifi-assembly/NOTICE | 5 +
nifi/nifi-assembly/pom.xml | 2 +-
nifi/nifi-bootstrap/pom.xml | 2 +-
.../nifi-data-provenance-utils/pom.xml | 2 +-
.../nifi-expression-language/pom.xml | 2 +-
.../nifi-commons/nifi-flowfile-packager/pom.xml | 2 +-
nifi/nifi-commons/nifi-logging-utils/pom.xml | 2 +-
.../nifi-processor-utilities/pom.xml | 2 +-
nifi/nifi-commons/nifi-properties/pom.xml | 2 +-
nifi/nifi-commons/nifi-security-utils/pom.xml | 2 +-
.../nifi-site-to-site-client/pom.xml | 8 +-
nifi/nifi-commons/nifi-socket-utils/pom.xml | 2 +-
nifi/nifi-commons/nifi-utils/pom.xml | 4 +-
nifi/nifi-commons/nifi-web-utils/pom.xml | 2 +-
nifi/nifi-commons/nifi-write-ahead-log/pom.xml | 2 +-
nifi/nifi-commons/pom.xml | 2 +-
nifi/nifi-docs/pom.xml | 2 +-
.../src/main/asciidoc/administration-guide.adoc | 5 +-
nifi/nifi-external/nifi-spark-receiver/pom.xml | 72 +-
nifi/nifi-external/pom.xml | 2 +-
.../nifi-processor-bundle-archetype/pom.xml | 6 +-
nifi/nifi-maven-archetypes/pom.xml | 5 +-
nifi/nifi-mock/pom.xml | 2 +-
.../nifi-framework-nar/pom.xml | 2 +-
.../nifi-framework/nifi-administration/pom.xml | 2 +-
.../nifi-framework/nifi-client-dto/pom.xml | 2 +-
.../nifi-cluster-authorization-provider/pom.xml | 2 +-
.../nifi-cluster-protocol/.gitignore | 1 -
.../nifi-cluster-protocol/pom.xml | 67 -
.../protocol/ClusterManagerProtocolSender.java | 69 -
.../cluster/protocol/ConnectionRequest.java | 44 -
.../cluster/protocol/ConnectionResponse.java | 141 -
.../apache/nifi/cluster/protocol/Heartbeat.java | 68 -
.../nifi/cluster/protocol/NodeBulletins.java | 44 -
.../nifi/cluster/protocol/NodeIdentifier.java | 172 -
.../cluster/protocol/NodeProtocolSender.java | 73 -
.../nifi/cluster/protocol/ProtocolContext.java | 39 -
.../cluster/protocol/ProtocolException.java | 40 -
.../nifi/cluster/protocol/ProtocolHandler.java | 44 -
.../nifi/cluster/protocol/ProtocolListener.java | 72 -
.../protocol/ProtocolMessageMarshaller.java | 38 -
.../protocol/ProtocolMessageUnmarshaller.java | 38 -
.../nifi/cluster/protocol/StandardDataFlow.java | 105 -
.../UnknownServiceAddressException.java | 39 -
.../impl/ClusterManagerProtocolSenderImpl.java | 245 --
.../ClusterManagerProtocolSenderListener.java | 118 -
.../protocol/impl/ClusterServiceDiscovery.java | 181 -
.../protocol/impl/ClusterServiceLocator.java | 229 --
.../impl/ClusterServicesBroadcaster.java | 182 -
.../protocol/impl/CopyingInputStream.java | 77 -
.../impl/MulticastProtocolListener.java | 204 -
.../protocol/impl/NodeProtocolSenderImpl.java | 171 -
.../impl/NodeProtocolSenderListener.java | 115 -
.../protocol/impl/SocketProtocolListener.java | 205 -
.../protocol/jaxb/JaxbProtocolContext.java | 148 -
.../jaxb/message/AdaptedConnectionRequest.java | 40 -
.../jaxb/message/AdaptedConnectionResponse.java | 109 -
.../protocol/jaxb/message/AdaptedCounter.java | 56 -
.../protocol/jaxb/message/AdaptedDataFlow.java | 64 -
.../protocol/jaxb/message/AdaptedHeartbeat.java | 66 -
.../jaxb/message/AdaptedNodeBulletins.java | 50 -
.../jaxb/message/AdaptedNodeIdentifier.java | 76 -
.../jaxb/message/ConnectionRequestAdapter.java | 41 -
.../jaxb/message/ConnectionResponseAdapter.java | 55 -
.../protocol/jaxb/message/DataFlowAdapter.java | 50 -
.../protocol/jaxb/message/HeartbeatAdapter.java | 54 -
.../jaxb/message/JaxbProtocolUtils.java | 42 -
.../jaxb/message/NodeBulletinsAdapter.java | 48 -
.../jaxb/message/NodeIdentifierAdapter.java | 51 -
.../protocol/jaxb/message/ObjectFactory.java | 104 -
.../message/ConnectionRequestMessage.java | 46 -
.../message/ConnectionResponseMessage.java | 66 -
.../ControllerStartupFailureMessage.java | 49 -
.../protocol/message/DisconnectMessage.java | 55 -
.../protocol/message/ExceptionMessage.java | 44 -
.../protocol/message/FlowRequestMessage.java | 46 -
.../protocol/message/FlowResponseMessage.java | 44 -
.../protocol/message/HeartbeatMessage.java | 43 -
.../message/MulticastProtocolMessage.java | 66 -
.../protocol/message/NodeBulletinsMessage.java | 43 -
.../cluster/protocol/message/PingMessage.java | 55 -
.../message/PrimaryRoleAssignmentMessage.java | 56 -
.../protocol/message/ProtocolMessage.java | 61 -
.../message/ReconnectionFailureMessage.java | 45 -
.../message/ReconnectionRequestMessage.java | 94 -
.../message/ReconnectionResponseMessage.java | 32 -
.../message/ServiceBroadcastMessage.java | 64 -
.../MulticastConfigurationFactoryBean.java | 60 -
.../ServerSocketConfigurationFactoryBean.java | 65 -
.../spring/SocketConfigurationFactoryBean.java | 66 -
.../resources/nifi-cluster-protocol-context.xml | 110 -
.../ClusterManagerProtocolSenderImplTest.java | 134 -
.../impl/ClusterServiceDiscoveryTest.java | 135 -
.../impl/ClusterServiceLocatorTest.java | 121 -
.../impl/ClusterServicesBroadcasterTest.java | 133 -
.../impl/MulticastProtocolListenerTest.java | 171 -
.../impl/NodeProtocolSenderImplTest.java | 203 -
.../impl/testutils/DelayedProtocolHandler.java | 57 -
.../testutils/ReflexiveProtocolHandler.java | 47 -
.../nifi-framework/nifi-cluster-web/.gitignore | 1 -
.../nifi-framework/nifi-cluster-web/pom.xml | 48 -
.../nifi/cluster/context/ClusterContext.java | 59 -
.../cluster/context/ClusterContextImpl.java | 69 -
.../context/ClusterContextThreadLocal.java | 47 -
.../ClusterAwareOptimisticLockingManager.java | 96 -
.../nifi-framework/nifi-cluster/.gitignore | 1 -
.../nifi-framework/nifi-cluster/pom.xml | 130 -
.../cluster/client/MulticastTestClient.java | 151 -
.../org/apache/nifi/cluster/event/Event.java | 122 -
.../apache/nifi/cluster/event/EventManager.java | 65 -
.../cluster/event/impl/EventManagerImpl.java | 143 -
.../cluster/firewall/ClusterNodeFirewall.java | 35 -
.../impl/FileBasedClusterNodeFirewall.java | 207 -
.../nifi/cluster/flow/ClusterDataFlow.java | 45 -
.../apache/nifi/cluster/flow/DaoException.java | 40 -
.../apache/nifi/cluster/flow/DataFlowDao.java | 62 -
.../cluster/flow/DataFlowManagementService.java | 115 -
.../nifi/cluster/flow/PersistedFlowState.java | 37 -
.../nifi/cluster/flow/StaleFlowException.java | 42 -
.../nifi/cluster/flow/impl/DataFlowDaoImpl.java | 600 ---
.../impl/DataFlowManagementServiceImpl.java | 356 --
.../nifi/cluster/manager/ClusterManager.java | 225 --
.../cluster/manager/HttpClusterManager.java | 169 -
.../cluster/manager/HttpRequestReplicator.java | 99 -
.../cluster/manager/HttpResponseMapper.java | 42 -
.../nifi/cluster/manager/NodeResponse.java | 329 --
.../exception/BlockedByFirewallException.java | 60 -
.../manager/exception/ClusterException.java | 40 -
.../ConnectingNodeMutableRequestException.java | 41 -
...DisconnectedNodeMutableRequestException.java | 41 -
.../exception/IllegalClusterStateException.java | 41 -
.../exception/IllegalNodeDeletionException.java | 41 -
.../IllegalNodeDisconnectionException.java | 42 -
.../IllegalNodeReconnectionException.java | 41 -
.../IneligiblePrimaryNodeException.java | 41 -
.../exception/MutableRequestException.java | 42 -
.../exception/NoConnectedNodesException.java | 41 -
.../exception/NoResponseFromNodesException.java | 42 -
.../exception/NodeDisconnectionException.java | 41 -
.../exception/NodeReconnectionException.java | 40 -
.../PrimaryRoleAssignmentException.java | 41 -
.../SafeModeMutableRequestException.java | 41 -
.../manager/exception/UnknownNodeException.java | 41 -
.../exception/UriConstructionException.java | 42 -
.../manager/impl/ClusteredEventAccess.java | 135 -
.../manager/impl/ClusteredReportingContext.java | 165 -
.../manager/impl/HttpRequestReplicatorImpl.java | 531 ---
.../manager/impl/HttpResponseMapperImpl.java | 85 -
.../cluster/manager/impl/WebClusterManager.java | 3628 ------------------
.../java/org/apache/nifi/cluster/node/Node.java | 252 --
...anagerProtocolServiceLocatorFactoryBean.java | 116 -
...FileBasedClusterNodeFirewallFactoryBean.java | 58 -
.../spring/WebClusterManagerFactoryBean.java | 139 -
.../reporting/ClusteredReportingTaskNode.java | 49 -
.../resources/nifi-cluster-manager-context.xml | 124 -
.../event/impl/EventManagerImplTest.java | 119 -
.../impl/FileBasedClusterNodeFirewallTest.java | 98 -
.../impl/DataFlowManagementServiceImplTest.java | 343 --
.../impl/HttpRequestReplicatorImplTest.java | 368 --
.../impl/HttpResponseMapperImplTest.java | 126 -
.../manager/impl/TestWebClusterManager.java | 54 -
.../cluster/manager/testutils/HttpRequest.java | 239 --
.../cluster/manager/testutils/HttpResponse.java | 93 -
.../manager/testutils/HttpResponseAction.java | 60 -
.../cluster/manager/testutils/HttpServer.java | 240 --
.../ClusterManagerProtocolSenderImplTest.java | 133 -
.../impl/ClusterServiceLocatorTest.java | 119 -
.../impl/ClusterServicesBroadcasterTest.java | 131 -
.../impl/MulticastProtocolListenerTest.java | 171 -
.../impl/NodeProtocolSenderImplTest.java | 201 -
.../impl/SocketProtocolListenerTest.java | 132 -
.../testutils/DelayedProtocolHandler.java | 57 -
.../testutils/ReflexiveProtocolHandler.java | 47 -
.../src/test/resources/logback-test.xml | 48 -
.../apache/nifi/cluster/firewall/impl/empty.txt | 0
.../apache/nifi/cluster/firewall/impl/ips.txt | 12 -
.../nifi-framework/nifi-documentation/pom.xml | 49 +
.../ConfigurableComponentInitializer.java | 38 +
.../apache/nifi/documentation/DocGenerator.java | 179 +
.../nifi/documentation/DocumentationWriter.java | 33 +
.../html/HtmlDocumentationWriter.java | 391 ++
.../html/HtmlProcessorDocumentationWriter.java | 58 +
.../init/ControllerServiceInitializer.java | 38 +
.../init/ProcessorInitializer.java | 37 +
.../init/ReportingTaskingInitializer.java | 37 +
...kControllerServiceInitializationContext.java | 40 +
.../mock/MockControllerServiceLookup.java | 55 +
.../MockProcessorInitializationContext.java | 45 +
.../MockReportingInitializationContext.java | 63 +
.../FullyDocumentedControllerService.java | 57 +
.../example/FullyDocumentedProcessor.java | 110 +
.../example/FullyDocumentedReportingTask.java | 50 +
.../documentation/example/NakedProcessor.java | 31 +
.../documentation/example/SampleService.java | 25 +
.../html/HtmlDocumentationWriterTest.java | 93 +
.../html/ProcessorDocumentationWriterTest.java | 103 +
.../nifi/documentation/html/XmlValidator.java | 50 +
.../nifi-file-authorization-provider/pom.xml | 2 +-
.../nifi-framework-cluster-protocol/.gitignore | 1 +
.../nifi-framework-cluster-protocol/pom.xml | 67 +
.../protocol/ClusterManagerProtocolSender.java | 69 +
.../cluster/protocol/ConnectionRequest.java | 44 +
.../cluster/protocol/ConnectionResponse.java | 141 +
.../apache/nifi/cluster/protocol/Heartbeat.java | 68 +
.../nifi/cluster/protocol/NodeBulletins.java | 44 +
.../nifi/cluster/protocol/NodeIdentifier.java | 172 +
.../cluster/protocol/NodeProtocolSender.java | 73 +
.../nifi/cluster/protocol/ProtocolContext.java | 39 +
.../cluster/protocol/ProtocolException.java | 40 +
.../nifi/cluster/protocol/ProtocolHandler.java | 44 +
.../nifi/cluster/protocol/ProtocolListener.java | 72 +
.../protocol/ProtocolMessageMarshaller.java | 38 +
.../protocol/ProtocolMessageUnmarshaller.java | 38 +
.../nifi/cluster/protocol/StandardDataFlow.java | 105 +
.../UnknownServiceAddressException.java | 39 +
.../impl/ClusterManagerProtocolSenderImpl.java | 245 ++
.../ClusterManagerProtocolSenderListener.java | 118 +
.../protocol/impl/ClusterServiceDiscovery.java | 181 +
.../protocol/impl/ClusterServiceLocator.java | 229 ++
.../impl/ClusterServicesBroadcaster.java | 182 +
.../protocol/impl/CopyingInputStream.java | 77 +
.../impl/MulticastProtocolListener.java | 204 +
.../protocol/impl/NodeProtocolSenderImpl.java | 171 +
.../impl/NodeProtocolSenderListener.java | 115 +
.../protocol/impl/SocketProtocolListener.java | 205 +
.../protocol/jaxb/JaxbProtocolContext.java | 148 +
.../jaxb/message/AdaptedConnectionRequest.java | 40 +
.../jaxb/message/AdaptedConnectionResponse.java | 109 +
.../protocol/jaxb/message/AdaptedCounter.java | 56 +
.../protocol/jaxb/message/AdaptedDataFlow.java | 64 +
.../protocol/jaxb/message/AdaptedHeartbeat.java | 66 +
.../jaxb/message/AdaptedNodeBulletins.java | 50 +
.../jaxb/message/AdaptedNodeIdentifier.java | 76 +
.../jaxb/message/ConnectionRequestAdapter.java | 41 +
.../jaxb/message/ConnectionResponseAdapter.java | 55 +
.../protocol/jaxb/message/DataFlowAdapter.java | 50 +
.../protocol/jaxb/message/HeartbeatAdapter.java | 54 +
.../jaxb/message/JaxbProtocolUtils.java | 42 +
.../jaxb/message/NodeBulletinsAdapter.java | 48 +
.../jaxb/message/NodeIdentifierAdapter.java | 51 +
.../protocol/jaxb/message/ObjectFactory.java | 104 +
.../message/ConnectionRequestMessage.java | 46 +
.../message/ConnectionResponseMessage.java | 66 +
.../ControllerStartupFailureMessage.java | 49 +
.../protocol/message/DisconnectMessage.java | 55 +
.../protocol/message/ExceptionMessage.java | 44 +
.../protocol/message/FlowRequestMessage.java | 46 +
.../protocol/message/FlowResponseMessage.java | 44 +
.../protocol/message/HeartbeatMessage.java | 43 +
.../message/MulticastProtocolMessage.java | 66 +
.../protocol/message/NodeBulletinsMessage.java | 43 +
.../cluster/protocol/message/PingMessage.java | 55 +
.../message/PrimaryRoleAssignmentMessage.java | 56 +
.../protocol/message/ProtocolMessage.java | 61 +
.../message/ReconnectionFailureMessage.java | 45 +
.../message/ReconnectionRequestMessage.java | 94 +
.../message/ReconnectionResponseMessage.java | 32 +
.../message/ServiceBroadcastMessage.java | 64 +
.../MulticastConfigurationFactoryBean.java | 60 +
.../ServerSocketConfigurationFactoryBean.java | 65 +
.../spring/SocketConfigurationFactoryBean.java | 66 +
.../resources/nifi-cluster-protocol-context.xml | 110 +
.../ClusterManagerProtocolSenderImplTest.java | 134 +
.../impl/ClusterServiceDiscoveryTest.java | 135 +
.../impl/ClusterServiceLocatorTest.java | 121 +
.../impl/ClusterServicesBroadcasterTest.java | 133 +
.../impl/MulticastProtocolListenerTest.java | 171 +
.../impl/NodeProtocolSenderImplTest.java | 203 +
.../impl/testutils/DelayedProtocolHandler.java | 57 +
.../testutils/ReflexiveProtocolHandler.java | 47 +
.../nifi-framework-cluster-web/.gitignore | 1 +
.../nifi-framework-cluster-web/pom.xml | 48 +
.../nifi/cluster/context/ClusterContext.java | 59 +
.../cluster/context/ClusterContextImpl.java | 69 +
.../context/ClusterContextThreadLocal.java | 47 +
.../ClusterAwareOptimisticLockingManager.java | 96 +
.../nifi-framework-cluster/.gitignore | 1 +
.../nifi-framework-cluster/pom.xml | 144 +
.../cluster/client/MulticastTestClient.java | 151 +
.../org/apache/nifi/cluster/event/Event.java | 122 +
.../apache/nifi/cluster/event/EventManager.java | 65 +
.../cluster/event/impl/EventManagerImpl.java | 143 +
.../cluster/firewall/ClusterNodeFirewall.java | 35 +
.../impl/FileBasedClusterNodeFirewall.java | 207 +
.../nifi/cluster/flow/ClusterDataFlow.java | 45 +
.../apache/nifi/cluster/flow/DaoException.java | 40 +
.../apache/nifi/cluster/flow/DataFlowDao.java | 62 +
.../cluster/flow/DataFlowManagementService.java | 115 +
.../nifi/cluster/flow/PersistedFlowState.java | 37 +
.../nifi/cluster/flow/StaleFlowException.java | 42 +
.../nifi/cluster/flow/impl/DataFlowDaoImpl.java | 600 +++
.../impl/DataFlowManagementServiceImpl.java | 356 ++
.../nifi/cluster/manager/ClusterManager.java | 225 ++
.../cluster/manager/HttpClusterManager.java | 169 +
.../cluster/manager/HttpRequestReplicator.java | 99 +
.../cluster/manager/HttpResponseMapper.java | 42 +
.../nifi/cluster/manager/NodeResponse.java | 329 ++
.../exception/BlockedByFirewallException.java | 60 +
.../manager/exception/ClusterException.java | 40 +
.../ConnectingNodeMutableRequestException.java | 41 +
...DisconnectedNodeMutableRequestException.java | 41 +
.../exception/IllegalClusterStateException.java | 41 +
.../exception/IllegalNodeDeletionException.java | 41 +
.../IllegalNodeDisconnectionException.java | 42 +
.../IllegalNodeReconnectionException.java | 41 +
.../IneligiblePrimaryNodeException.java | 41 +
.../exception/MutableRequestException.java | 42 +
.../exception/NoConnectedNodesException.java | 41 +
.../exception/NoResponseFromNodesException.java | 42 +
.../exception/NodeDisconnectionException.java | 41 +
.../exception/NodeReconnectionException.java | 40 +
.../PrimaryRoleAssignmentException.java | 41 +
.../SafeModeMutableRequestException.java | 41 +
.../manager/exception/UnknownNodeException.java | 41 +
.../exception/UriConstructionException.java | 42 +
.../manager/impl/ClusteredEventAccess.java | 135 +
.../manager/impl/ClusteredReportingContext.java | 165 +
.../manager/impl/HttpRequestReplicatorImpl.java | 531 +++
.../manager/impl/HttpResponseMapperImpl.java | 85 +
.../cluster/manager/impl/WebClusterManager.java | 3628 ++++++++++++++++++
.../java/org/apache/nifi/cluster/node/Node.java | 252 ++
...anagerProtocolServiceLocatorFactoryBean.java | 116 +
...FileBasedClusterNodeFirewallFactoryBean.java | 58 +
.../spring/WebClusterManagerFactoryBean.java | 139 +
.../reporting/ClusteredReportingTaskNode.java | 49 +
.../resources/nifi-cluster-manager-context.xml | 124 +
.../event/impl/EventManagerImplTest.java | 119 +
.../impl/FileBasedClusterNodeFirewallTest.java | 98 +
.../impl/DataFlowManagementServiceImplTest.java | 343 ++
.../impl/HttpRequestReplicatorImplTest.java | 368 ++
.../impl/HttpResponseMapperImplTest.java | 126 +
.../manager/impl/TestWebClusterManager.java | 54 +
.../cluster/manager/testutils/HttpRequest.java | 239 ++
.../cluster/manager/testutils/HttpResponse.java | 93 +
.../manager/testutils/HttpResponseAction.java | 60 +
.../cluster/manager/testutils/HttpServer.java | 240 ++
.../ClusterManagerProtocolSenderImplTest.java | 133 +
.../impl/ClusterServiceLocatorTest.java | 119 +
.../impl/ClusterServicesBroadcasterTest.java | 131 +
.../impl/MulticastProtocolListenerTest.java | 171 +
.../impl/NodeProtocolSenderImplTest.java | 201 +
.../impl/SocketProtocolListenerTest.java | 132 +
.../testutils/DelayedProtocolHandler.java | 57 +
.../testutils/ReflexiveProtocolHandler.java | 47 +
.../src/test/resources/logback-test.xml | 48 +
.../apache/nifi/cluster/firewall/impl/empty.txt | 0
.../apache/nifi/cluster/firewall/impl/ips.txt | 12 +
.../nifi-framework-core-api/pom.xml | 2 +-
.../nifi-framework/nifi-framework-core/pom.xml | 21 +-
.../nifi-framework/nifi-nar-utils/pom.xml | 2 +-
.../nifi-framework/nifi-resources/LICENSE | 202 +
.../nifi-framework/nifi-resources/NOTICE | 5 +
.../nifi-framework/nifi-resources/pom.xml | 2 +-
.../src/main/assembly/dependencies.xml | 16 +
.../nifi-framework/nifi-runtime/pom.xml | 7 +-
.../src/main/java/org/apache/nifi/NiFi.java | 3 +
.../nifi-framework/nifi-security/pom.xml | 2 +-
.../nifi-framework/nifi-site-to-site/pom.xml | 2 +-
.../nifi-framework/nifi-user-actions/pom.xml | 2 +-
.../nifi-web/nifi-custom-ui-utilities/pom.xml | 2 +-
.../nifi-framework/nifi-web/nifi-jetty/pom.xml | 2 +-
.../nifi-web/nifi-web-api/pom.xml | 4 +-
.../nifi-web/nifi-web-docs/pom.xml | 2 +-
.../src/main/webapp/css/component-usage.css | 94 +-
.../nifi-web/nifi-web-error/pom.xml | 2 +-
.../nifi-web-optimistic-locking/pom.xml | 2 +-
.../nifi-web/nifi-web-security/pom.xml | 2 +-
.../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 15 +-
.../nifi-framework/nifi-web/pom.xml | 10 +-
.../nifi-framework/pom.xml | 9 +-
.../nifi-framework-bundle/pom.xml | 39 +-
.../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml | 2 +-
.../nifi-hdfs-processors/pom.xml | 2 +-
.../additionalDetails.html | 53 +
.../index.html | 88 -
.../additionalDetails.html | 57 +
.../index.html | 162 -
.../additionalDetails.html | 32 +
.../index.html | 150 -
.../additionalDetails.html | 51 +
.../index.html | 159 -
.../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml | 4 +-
.../nifi-hadoop-libraries-nar/pom.xml | 5 +-
.../nifi-hadoop-libraries-bundle/pom.xml | 2 +-
nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml | 2 +-
.../nifi-kafka-bundle/nifi-kafka-nar/pom.xml | 2 +-
.../nifi-kafka-processors/pom.xml | 2 +-
.../additionalDetails.html | 78 +
.../index.html | 173 -
.../additionalDetails.html | 45 +
.../index.html | 189 -
nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 4 +-
.../nifi-kite-bundle/nifi-kite-nar/pom.xml | 44 +-
.../src/main/resources/META-INF/LICENSE | 38 -
.../src/main/resources/META-INF/NOTICE | 37 +-
.../nifi-kite-processors/pom.xml | 18 +-
.../processors/kite/AbstractKiteProcessor.java | 8 +-
.../nifi/processors/kite/ConvertCSVToAvro.java | 25 +-
.../nifi/processors/kite/ConvertJSONToAvro.java | 17 +-
.../nifi/processors/kite/JSONFileReader.java | 114 -
.../processors/kite/StoreInKiteDataset.java | 7 +-
.../data/spi/filesystem/CSVFileReaderFixed.java | 172 -
.../nifi/processors/kite/TestGetSchema.java | 3 +
nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml | 18 +-
.../pom.xml | 2 +-
.../nifi-provenance-repository-nar/pom.xml | 2 +-
.../nifi-volatile-provenance-repository/pom.xml | 2 +-
.../nifi-provenance-repository-bundle/pom.xml | 6 +-
.../nifi-standard-nar/pom.xml | 2 +-
.../nifi-standard-prioritizers/pom.xml | 2 +-
.../nifi-standard-processors/pom.xml | 88 +-
.../processors/standard/DistributeLoad.java | 2 +-
.../processors/standard/HandleHttpRequest.java | 7 +-
.../index.html | 63 -
.../additionalDetails.html | 68 +
.../index.html | 166 -
.../index.html | 116 -
.../index.html | 65 -
.../additionalDetails.html | 58 +
.../index.html | 147 -
.../additionalDetails.html | 40 +
.../index.html | 106 -
.../index.html | 97 -
.../additionalDetails.html | 58 +
.../index.html | 155 -
.../index.html | 160 -
.../additionalDetails.html | 34 +
.../index.html | 135 -
.../additionalDetails.html | 161 +
.../index.html | 311 --
.../index.html | 100 -
.../additionalDetails.html | 57 +
.../index.html | 111 -
.../index.html | 64 -
.../additionalDetails.html | 74 +
.../index.html | 227 --
.../additionalDetails.html | 79 +
.../index.html | 186 -
.../additionalDetails.html | 45 +
.../index.html | 143 -
.../index.html | 118 -
.../index.html | 122 -
.../additionalDetails.html | 80 +
.../index.html | 250 --
.../additionalDetails.html | 127 +
.../index.html | 255 --
.../additionalDetails.html | 57 +
.../index.html | 112 -
.../additionalDetails.html | 35 +
.../index.html | 88 -
.../additionalDetails.html | 35 +
.../index.html | 89 -
.../additionalDetails.html | 44 +
.../index.html | 136 -
.../additionalDetails.html | 64 +
.../index.html | 181 -
.../index.html | 86 -
.../index.html | 144 -
.../index.html | 80 -
.../additionalDetails.html | 115 +
.../index.html | 347 --
.../index.html | 64 -
.../additionalDetails.html | 49 +
.../index.html | 143 -
.../additionalDetails.html | 48 +
.../index.html | 187 -
.../index.html | 114 -
.../additionalDetails.html | 48 +
.../index.html | 283 --
.../index.html | 109 -
.../index.html | 152 -
.../additionalDetails.html | 34 +
.../index.html | 281 --
.../index.html | 91 -
.../index.html | 114 -
.../additionalDetails.html | 46 +
.../index.html | 110 -
.../index.html | 82 -
.../index.html | 85 -
.../additionalDetails.html | 45 +
.../index.html | 100 -
.../additionalDetails.html | 82 +
.../index.html | 123 -
.../additionalDetails.html | 67 +
.../index.html | 107 -
.../index.html | 85 -
.../additionalDetails.html | 72 +
.../index.html | 121 -
.../index.html | 64 -
.../index.html | 63 -
.../additionalDetails.html | 106 +
.../index.html | 163 -
.../index.html | 56 -
.../nifi-standard-reporting-tasks/pom.xml | 2 +-
.../additionalDetails.html | 70 +
.../index.html | 85 -
.../index.html | 58 -
.../index.html | 77 -
.../additionalDetails.html | 41 +
.../index.html | 65 -
.../nifi-standard-bundle/pom.xml | 8 +-
.../pom.xml | 2 +-
.../pom.xml | 2 +-
.../additionalDetails.html | 52 +
.../index.html | 98 -
.../additionalDetails.html | 31 +
.../index.html | 51 -
.../nifi-distributed-cache-protocol/pom.xml | 2 +-
.../nifi-distributed-cache-server/pom.xml | 2 +-
.../additionalDetails.html | 53 +
.../index.html | 103 -
.../nifi-distributed-cache-services-nar/pom.xml | 2 +-
.../pom.xml | 2 +-
.../nifi-http-context-map-api/pom.xml | 4 +-
.../nifi-http-context-map-nar/pom.xml | 2 +-
.../nifi-http-context-map/pom.xml | 2 +-
.../nifi-http-context-map-bundle/pom.xml | 2 +-
.../nifi-load-distribution-service-api/pom.xml | 2 +-
.../nifi-ssl-context-nar/pom.xml | 2 +-
.../nifi-ssl-context-service/pom.xml | 2 +-
.../additionalDetails.html | 49 +
.../index.html | 63 -
.../nifi-ssl-context-bundle/pom.xml | 2 +-
.../nifi-ssl-context-service-api/pom.xml | 2 +-
.../nifi-standard-services-api-nar/pom.xml | 2 +-
.../nifi-standard-services/pom.xml | 2 +-
.../nifi-update-attribute-model/pom.xml | 2 +-
.../nifi-update-attribute-nar/pom.xml | 2 +-
.../nifi-update-attribute-processor/pom.xml | 2 +-
.../additionalDetails.html | 253 ++
.../index.html | 253 --
.../nifi-update-attribute-ui/pom.xml | 2 +-
.../nifi-update-attribute-bundle/pom.xml | 8 +-
nifi/nifi-nar-bundles/pom.xml | 30 +-
nifi/pom.xml | 103 +-
537 files changed, 23293 insertions(+), 27770 deletions(-)
----------------------------------------------------------------------