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

[Fix][Producer] Stop block request even if Value and Payload are both set #1052

Merged
merged 9 commits into from Jul 13, 2023

Conversation

gunli
Copy link
Contributor

@gunli gunli commented Jul 7, 2023

Motivation

Currently, if !p.options.DisableBlockIfQueueFull and msg.Value != nil && msg.Payload != nil, request will be blocked forever 'cause defer request.stopBlock() is set up after the verify logic.

if msg.Value != nil && msg.Payload != nil {
	p.log.Error("Can not set Value and Payload both")
	runCallback(request.callback, nil, request.msg, errors.New("can not set Value and Payload both"))
	return
}

// The block chan must be closed when returned with exception
defer request.stopBlock()

Here is the PR to stop block request even if Value and Payload are both set

Modifications

  • pulsar/producer_partition.go

Verifying this change

  • Make sure that the change passes the CI checks.

(Please pick either of the following options)

This change is a trivial rework / code cleanup without any test coverage.

(or)

This change is already covered by existing tests, such as (please describe tests).

(or)

This change added tests and can be verified as follows:

(example:)

  • Added integration tests for end-to-end deployment with large payloads (10MB)
  • Extended integration test for recovery after broker failure

Does this pull request potentially affect one of the following parts:

If yes was chosen, please highlight the changes

  • Dependencies (does it add or upgrade a dependency): (no)
  • The public API: (no)
  • The schema: (no)
  • The default values of configurations: (no)
  • The wire protocol: (no)

Documentation

  • Does this pull request introduce a new feature? (no)
  • If yes, how is the feature documented? (not applicable / docs / GoDocs / not documented)
  • If a feature is not applicable for documentation, explain why?
  • If a feature is not documented yet in this PR, please create a followup issue for adding the documentation

Copy link
Member

@RobertIndie RobertIndie left a comment

Choose a reason for hiding this comment

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

Looks good to me. Could you add a test?

@gunli
Copy link
Contributor Author

gunli commented Jul 11, 2023

Looks good to me. Could you add a test?

Test is added.

@RobertIndie RobertIndie merged commit e45122c into apache:master Jul 13, 2023
6 checks passed
@RobertIndie RobertIndie added this to the v0.12.0 milestone Jul 13, 2023
RobertIndie pushed a commit that referenced this pull request Sep 7, 2023
… set (#1052)

### Motivation
Currently, if `!p.options.DisableBlockIfQueueFull` and `msg.Value != nil && msg.Payload != nil`, request will be blocked forever 'cause `defer request.stopBlock()` is set up after the verify logic.
```go
if msg.Value != nil && msg.Payload != nil {
	p.log.Error("Can not set Value and Payload both")
	runCallback(request.callback, nil, request.msg, errors.New("can not set Value and Payload both"))
	return
}

// The block chan must be closed when returned with exception
defer request.stopBlock()
```
Here is the PR to stop block request even if Value and Payload are both set

### Modifications

- pulsar/producer_partition.go

---------

Co-authored-by: gunli <gunli@tencent.com>
(cherry picked from commit e45122c)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants