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/NIFI-353 Commit: b560a88cbde48e669cee89e2c6cb18fcae736c72 Parents: 7198912 Author: Mark Payne <[email protected]> Authored: Wed Mar 18 10:10:21 2015 -0400 Committer: Mark Payne <[email protected]> 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<>();
