diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java index 4ae94c47ca65..a71d2d6e1044 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java @@ -3751,13 +3751,14 @@ private void handleContentNotFound(final ContentNotFoundException nfe, final Sta if (missingClaim == registeredClaim) { suspectRecord.markForAbort(); + LOG.warn("Unable to find content for {}; dropping FlowFile", suspectRecord.getCurrent(), nfe); rollback(); - throw new MissingFlowFileException("Unable to find content for FlowFile", nfe); + throw new MissingFlowFileException("Unable to find content for " + suspectRecord.getCurrent() + "; dropping FlowFile", nfe); } if (missingClaim == transientClaim) { rollback(); - throw new MissingFlowFileException("Unable to find content for FlowFile", nfe); + throw new MissingFlowFileException("Unable to find in-flight content for " + suspectRecord.getCurrent() + "; rolling back", nfe); } } diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/StandardProcessSessionIT.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/StandardProcessSessionIT.java index 314e3295ec5e..db119a1db7cf 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/StandardProcessSessionIT.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/StandardProcessSessionIT.java @@ -1601,7 +1601,10 @@ public void testMissingFlowFileExceptionThrownWhenUnableToReadData() { // attempt to read the data. final FlowFile ff1 = session.get(); - assertThrows(MissingFlowFileException.class, () -> session.read(ff1, InputStream::read)); + final MissingFlowFileException ex = assertThrows(MissingFlowFileException.class, + () -> session.read(ff1, InputStream::read)); + assertTrue(ex.getMessage().contains("12345678-1234-1234-1234-123456789012")); + assertTrue(ex.getMessage().contains("rolling back")); } @Test @@ -1775,7 +1778,10 @@ public void testContentNotFoundExceptionThrownWhenUnableToReadDataOffsetTooLarge session.get(); final FlowFile ff2 = session.get(); - assertThrows(MissingFlowFileException.class, () -> session.read(ff2, InputStream::read)); + final MissingFlowFileException ex = assertThrows(MissingFlowFileException.class, + () -> session.read(ff2, InputStream::read)); + assertTrue(ex.getMessage().contains("12345678-1234-1234-1234-123456789012")); + assertTrue(ex.getMessage().contains("rolling back")); } @Test