Skip to content

NIFI-6820 If Processor adjusts a counter but does not interact with a… #4663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markap14 merged 1 commit into from
Nov 13, 2020
Merged

NIFI-6820 If Processor adjusts a counter but does not interact with a… #4663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...work-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ public void checkpoint() {
this.checkpoint = new Checkpoint();
}

if (records.isEmpty()) {
if (records.isEmpty() && (countersOnCommit == null || countersOnCommit.isEmpty())) {
LOG.trace("{} checkpointed, but no events were performed by this ProcessSession", this);
return;
}
Expand Down
38 changes: 38 additions & 0 deletions ...-core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,44 @@ public void testRoundRobinOnSessionGetNoArgs() {
verify(conn2, times(1)).poll(any(Set.class));
}

@Test
public void testCheckpointOnSessionDoesNotInteractWithFlowFile() {
final Relationship relationship = new Relationship.Builder().name("A").build();

session.adjustCounter("a", 1, false);
session.adjustCounter("a", 1, true);
session.checkpoint();

session.adjustCounter("a", 1, true);
session.adjustCounter("a", 2, false);
session.adjustCounter("b", 3, false);
session.checkpoint();

assertEquals(2, counterRepository.getCounters().size());
session.commit();

final List<Counter> counters = counterRepository.getCounters();
assertEquals(4, counters.size());

int aCounters = 0;
int bCounters = 0;
for (final Counter counter : counters) {
switch (counter.getName()) {
case "a":
assertEquals(5, counter.getValue());
aCounters++;
break;
case "b":
assertEquals(3, counter.getValue());
bCounters++;
break;
}
}

assertEquals(2, aCounters);
assertEquals(2, bCounters);
}

@Test
public void testCheckpointMergesCounters() {
final Relationship relationship = new Relationship.Builder().name("A").build();
Expand Down