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-4733: Addressing two phase commit logic issue in variable registry #2370

Merged
merged 1 commit into from
Jan 4, 2018

Conversation

mcgilman
Copy link
Contributor

@mcgilman mcgilman commented Jan 4, 2018

NIFI-4733:

  • Resolving logic issue in two phase commit when updating variable registry.

@alopresto
Copy link
Contributor

Reviewing...

@@ -552,41 +553,43 @@ public Response deleteVariableRegistryUpdateRequest(
public Response updateVariableRegistry(
@Context final HttpServletRequest httpServletRequest,
@ApiParam(value = "The process group id.", required = true) @PathParam("id") final String groupId,
@ApiParam(value = "The process group configuration details.", required = true) final VariableRegistryEntity requestEntity) {
@ApiParam(value = "The process group configuration details.", required = true) final VariableRegistryEntity requestVariableRegistryEntity) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Should the ApiParam value be updated to reflect that this is VR-specific as opposed to generic PG configuration?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes good catch.

@@ -620,13 +623,13 @@ public Response updateVariableRegistry(
public Response submitUpdateVariableRegistryRequest(
@Context final HttpServletRequest httpServletRequest,
@ApiParam(value = "The process group id.", required = true) @PathParam("id") final String groupId,
@ApiParam(value = "The process group configuration details.", required = true) final VariableRegistryEntity requestEntity) {
@ApiParam(value = "The process group configuration details.", required = true) final VariableRegistryEntity requestVariableRegistryEntity) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Probably here too, then.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yup.

@alopresto
Copy link
Contributor

I ran a cluster with the patch applied and ensured no regressions on the two phase commit. Once the minor fixes are done, I can merge, but I'll leave the pre-emptive +1 here in case I am away from my computer.

Ran contrib-check and all tests pass. +1.

- Resolving logic issue in two phase commit when updating variable registry. This closes apache#2370
@mcgilman
Copy link
Contributor Author

mcgilman commented Jan 4, 2018

Thanks @alopresto! I've addressed the comments here and I will merge to master.

@asfgit asfgit merged commit 7a8dbb8 into apache:master Jan 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants