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

KAFKA-2328; merge-kafka-pr.py script should not leave user in a detached branch #84

Closed

Conversation

ijuma
Copy link
Contributor

@ijuma ijuma commented Jul 17, 2015

The right command to get the branch name is git rev-parse --abbrev-ref HEAD instead of git rev-parse HEAD. The latter gives the commit hash causing a detached branch when we checkout to it. Seems like a bug we inherited from the Spark script.

@asfbot
Copy link

asfbot commented Jul 17, 2015

kafka-trunk-git-pr #13 FAILURE
Looks like there's a problem with this pull request

@asfgit asfgit closed this in 2040890 Jul 20, 2015
@ijuma ijuma deleted the kafka-2328-merge-script-no-detached-branch branch August 14, 2015 09:48
resetius added a commit to resetius/kafka that referenced this pull request Jan 24, 2017
[LOGBROKER-1964] use ThreadLocal for json parser
allenxwang pushed a commit to allenxwang/kafka that referenced this pull request Apr 9, 2019
…TimeoutTest to 2.1

* commit '3d71111c620998071a93e204c8843d6ea943e497':
  [NFLX] Add test to verify expiration of batches across multiple partitions on delivery.timeout.
efeg pushed a commit to efeg/kafka that referenced this pull request Jun 26, 2020
…nds for lz4-java bug affecting byte buffers (apache#6679)" (apache#7769) (apache#84)

TICKET = KAFKA-9203
LI_DESCRIPTION =

EXIT_CRITERIA = HASH [f8129f6]
ORIGINAL_DESCRIPTION =

This reverts commit 90043d5 as it caused a regression in some cases:

> Caused by: java.io.IOException: Stream frame descriptor corrupted
>         at org.apache.kafka.common.record.KafkaLZ4BlockInputStream.readHeader(KafkaLZ4BlockInputStream.java:132)
>         at org.apache.kafka.common.record.KafkaLZ4BlockInputStream.<init>(KafkaLZ4BlockInputStream.java:78)
>         at org.apache.kafka.common.record.CompressionType$4.wrapForInput(CompressionType.java:110)

I will investigate why after, but I want to get the safe fix into 2.4.0.
The reporter of KAFKA-9203 has verified that reverting this change
makes the problem go away.

Reviewers: Manikumar Reddy <manikumar.reddy@gmail.com>
(cherry picked from commit f8129f6)

Co-authored-by: Ismael Juma <ismael@juma.me.uk>
rustd pushed a commit to rustd/pranavfinaldemokafka that referenced this pull request Feb 9, 2024
…pache#84)

Reviewers: David Jacot <djacot@confluent.io>

Co-authored-by: Manikumar Reddy <manikumar.reddy@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants