Skip to content
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.

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

NIFI-6578 - Upgraded zookeeper framework version. Some code changes r… #3715

Closed
wants to merge 4 commits into from

Conversation

@thenatog
Copy link
Contributor

thenatog commented Sep 9, 2019

…equired. This change also required a change to the embedded zookeeper.

NIFI-6578 - Updating tests to account for the new node /zookeeper/config

Upgraded Zookeeper and Curator versions for zookeeper migrator in toolkit. Updated tests to allow for new znode /zookeeper/config

NIFI-6578 - Added documentation changes to reflect changes to the zookeeper.properties file going foward.

Thank you for submitting a contribution to Apache NiFi.

Please provide a short description of the PR here:

Description of PR

Enables X functionality; fixes bug NIFI-YYYY.

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 master)?

  • 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 both JDK 8 and 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 travis-ci for build issues and submit an update to your PR as soon as possible.

…equired. This change also required a change to the embedded zookeeper.

NIFI-6578 - Updating tests to account for the new node /zookeeper/config

Upgraded Zookeeper and Curator versions for zookeeper migrator in toolkit. Updated tests to allow for new znode /zookeeper/config

NIFI-6578 - Added documentation changes to reflect changes to the zookeeper.properties file going foward.

NIFI-6578 - Added some more information in docs.
@thenatog

This comment has been minimized.

Copy link
Contributor Author

thenatog commented Sep 9, 2019

Looks like @markap14 @jtstorck are two people who have touched Zookeeper and Zookeeper migrator before.

thenatog added 2 commits Sep 9, 2019
@thenatog

This comment has been minimized.

Copy link
Contributor Author

thenatog commented Sep 13, 2019

To test this PR:

With embedded zookeeper:

  • nifi.zookeeper.connect.string=localhost:2181
  • nifi.state.management.embedded.zookeeper.start=true
  • zookeeper.properties file:
    • Remove clientPort=2181
    • Add port to end of server string: server.1=localhost:2888:3888;2181

With external zookeeper quorum:

  • Write the docker-compose.yml file from this page: https://hub.docker.com/_/zookeeper to a directory, run docker-compose up
  • Configure NiFi to use the docker zookeeper nodes:
    • nifi.properties: nifi.zookeeper.connect.string=zoo1:2281,zoo2:2282,zoo3:2283
  • state-management.xml: zoo1:2281,zoo2:2282,zoo:2283

In zookeeper.properties file define:

  • server.1=zoo1:2888:3888;2281

  • server.2=zoo2:2888:3888;2282
  • 
server.3=zoo32888:3888;2282
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>

This comment has been minimized.

Copy link
@markap14

markap14 Sep 20, 2019

Contributor

I don't believe we need this, do we?

This comment has been minimized.

Copy link
@thenatog

thenatog Sep 20, 2019

Author Contributor

Nope, will remove

@asfgit asfgit closed this in 282c271 Sep 20, 2019
@markap14

This comment has been minimized.

Copy link
Contributor

markap14 commented Sep 20, 2019

Thanks @thenatog all looks good to me. Merged to master.

szaboferee added a commit to szaboferee/nifi that referenced this pull request Oct 7, 2019
…equired. This change also required a change to the embedded zookeeper.

- Updating tests to account for the new node /zookeeper/config
Upgraded Zookeeper and Curator versions for zookeeper migrator in toolkit. Updated tests to allow for new znode /zookeeper/config
- Added documentation changes to reflect changes to the zookeeper.properties file going foward.

This closes apache#3715.

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
Projects
None yet
2 participants
You can’t perform that action at this time.