Skip to content

NIFI-8215: --wait-for-init feature in nifi.sh refactored#4814

Closed
pgyori wants to merge 2 commits intoapache:mainfrom
pgyori:NIFI-8215
Closed

NIFI-8215: --wait-for-init feature in nifi.sh refactored#4814
pgyori wants to merge 2 commits intoapache:mainfrom
pgyori:NIFI-8215

Conversation

@pgyori
Copy link
Contributor

@pgyori pgyori commented Feb 9, 2021

https://issues.apache.org/jira/browse/NIFI-8215

This makes the --wait-for-init feature in the nifi.sh script runnable in sh on Ubuntu.

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.

@pgyori
Copy link
Contributor Author

pgyori commented Feb 9, 2021

@jfrazee , may I ask you to have a look at this PR?
Thank you in advance!

@jfrazee
Copy link
Member

jfrazee commented Feb 9, 2021

@pgyori I gave this a very quick test on a system using dash as /bin/sh and it works as expected. Reading the code, the changes look correct too. I'm going to do a few other tests.

@pgyori
Copy link
Contributor Author

pgyori commented Feb 9, 2021

Thank you, @jfrazee !

Copy link
Contributor

@kevdoran kevdoran left a comment

Choose a reason for hiding this comment

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

+1, ran shellcheck and tested an assembly based on this in an openjdk:8-jre-alpine, which does not use bash for its POSIX shell

@jfrazee
Copy link
Member

jfrazee commented Feb 9, 2021

@pgyori I should have mentioned this since I saw it yesterday, but this doesn't apply the --wait-for-init to restart since the $@ isn't provided to the start. The naive change would be this:

restart)
    init                                                                                           
    shift
    run "stop"             
    run "start" "$@"
    ;;

I'm not 100% sure whether that's correct though because in run() there's some use of $1 and the shift changes $@. Should we change this now, or do it later?

@pgyori
Copy link
Contributor Author

pgyori commented Feb 9, 2021

@jfrazee I would recommend to postpone this modification until after the release so that we have more time to test it.

@jfrazee jfrazee closed this in b9b1312 Feb 9, 2021
driesva pushed a commit to driesva/nifi that referenced this pull request Mar 19, 2021
This fixes apache#4814

Signed-off-by: Joey Frazee <jfrazee@apache.org>
krisztina-zsihovszki pushed a commit to krisztina-zsihovszki/nifi that referenced this pull request Jun 28, 2022
This fixes apache#4814

Signed-off-by: Joey Frazee <jfrazee@apache.org>
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.

3 participants