Skip to content

Cherrypick: e24d82e0e#22

Merged
smccauliff merged 1 commit into
linkedin:2.0-lifrom
smccauliff:cherry-pick-sync
Apr 29, 2019
Merged

Cherrypick: e24d82e0e#22
smccauliff merged 1 commit into
linkedin:2.0-lifrom
smccauliff:cherry-pick-sync

Conversation

@smccauliff

Copy link
Copy Markdown

This cherrypick contains merge conflict resolution as some of our patches are not available in upstream.

KAFKA-7280; Synchronize consumer fetch request/response handling (apache#5495)

This patch fixes unsafe concurrent access in the consumer by the heartbeat thread and the thread calling `poll()` to the fetch session state in `FetchSessionHandler`.

Reviewers: Viktor Somogyi <viktorsomogyi@gmail.com>, Jason Gustafson <jason@confluent.io>

Committer Checklist (excluded from commit message)

  • [ ✔️] Verify design and implementation It's amazing!
  • [✔️ ] Verify test coverage and CI build status
  • [✔️ ] Verify documentation (including upgrade notes)

KAFKA-7280; Synchronize consumer fetch request/response handling (apache#5495)

This patch fixes unsafe concurrent access in the consumer by the heartbeat thread and the thread calling `poll()` to the fetch session state in `FetchSessionHandler`.

Reviewers: Viktor Somogyi <viktorsomogyi@gmail.com>, Jason Gustafson <jason@confluent.io>

@MayureshGharat MayureshGharat left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Open source has clearBufferedDataForUnassignedPartitions(...) instead of filterUnassignedPartitions(...) as is in Li/Kafka branch. I am not sure, why the naming is different internally, but this might cause conflicts for future merges. I don't want to block merging this patch, but thought that I should mention the concern.

@smccauliff smccauliff merged commit e464234 into linkedin:2.0-li Apr 29, 2019
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