Skip to content

NIFI-8102 TailFile can skip characters if tailing a file on NFS mount#4736

Closed
adenes wants to merge 2 commits intoapache:mainfrom
adenes:NIFI-8102
Closed

NIFI-8102 TailFile can skip characters if tailing a file on NFS mount#4736
adenes wants to merge 2 commits intoapache:mainfrom
adenes:NIFI-8102

Conversation

@adenes
Copy link
Contributor

@adenes adenes commented Dec 18, 2020

  • Force the TailFile processor to recreate and reposition the reader
    by setting it to null in case of a NulCharacterEncounteredException
  • Updated the TestTailFile.testNULContent() to not initialize the
    processor when calling the second run()

In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:

For all changes:

  • Is there a JIRA ticket associated with this PR? Is it referenced
    in the commit message?

  • Does your PR title start with NIFI-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.

  • Has your PR been rebased against the latest commit within the target branch (typically main)?

  • Is your initial contribution a single, squashed commit? Additional commits in response to PR reviewer feedback should be made on this branch and pushed to allow change tracking. Do not squash or use --force when pushing to allow for clean monitoring of changes.

For code changes:

  • Have you ensured that the full suite of tests is executed via mvn -Pcontrib-check clean install at the root nifi folder?
  • Have you written or updated unit tests to verify your changes?
  • Have you verified that the full build is successful on JDK 8?
  • Have you verified that the full build is successful on JDK 11?
  • If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?
  • If applicable, have you updated the LICENSE file, including the main LICENSE file under nifi-assembly?
  • If applicable, have you updated the NOTICE file, including the main NOTICE file found under nifi-assembly?
  • If adding new Properties, have you added .displayName in addition to .name (programmatic access) for each of the new properties?

For documentation related changes:

  • Have you ensured that format looks appropriate for the output in which it is rendered?

Note:

Please ensure that once the PR is submitted, you check GitHub Actions CI for build issues and submit an update to your PR as soon as possible.

- Force the TailFile processor to recreate and reposition the reader
  by setting it to null in case of a NulCharacterEncounteredException
- Updated the TestTailFile.testNULContent() to not initialize the
  processor when calling the second run()
session.remove(flowFile);
tfo.setState(new TailFileState(tailFile, file, reader, position, timestamp, length, checksum, state.getBuffer()));
// store the new position and set the reader to null to reinitialize and reposition it
tfo.setState(new TailFileState(tailFile, file, null, positionHolder.get(), timestamp, length, checksum, state.getBuffer()));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't just abandon the existing reader here, as we need to make sure that it gets closed. Otherwise we'd be leaking a file handle. But I don't think we really want to close and abandon the reader we already have anyway. Since we know where we want the reader to be positioned, we should be able to just use reader.position(positionHolder.get()); no?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @markap14 , agree, updated the pr

Update the reader's position instead of abandoning it.
@markap14
Copy link
Contributor

Thanks @adenes . Changes look good to me. Will wait for the Github Actions to complete and assuming that all is green there i'll go ahead and merge.

@markap14 markap14 closed this in 31c5dc5 Dec 18, 2020
@markap14
Copy link
Contributor

Looks like all checked out good, +1 merged to main. Thanks @adenes !

driesva pushed a commit to driesva/nifi that referenced this pull request Mar 19, 2021
- Force the TailFile processor to recreate and reposition the reader
  by setting it to null in case of a NulCharacterEncounteredException
- Updated the TestTailFile.testNULContent() to not initialize the
  processor when calling the second run()

Update the reader's position instead of abandoning it.

This closes apache#4736.

Signed-off-by: Mark Payne <markap14@hotmail.com>
krisztina-zsihovszki pushed a commit to krisztina-zsihovszki/nifi that referenced this pull request Jun 28, 2022
- Force the TailFile processor to recreate and reposition the reader
  by setting it to null in case of a NulCharacterEncounteredException
- Updated the TestTailFile.testNULContent() to not initialize the
  processor when calling the second run()

Update the reader's position instead of abandoning it.

This closes apache#4736.

Signed-off-by: Mark Payne <markap14@hotmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants