Skip to content

Ccs master merge 3.3 branching point#771

Merged
Ismael Juma (ijuma) merged 8 commits into
masterfrom
ccs-master-merge-3.3-branching-point
Aug 4, 2022
Merged

Ccs master merge 3.3 branching point#771
Ismael Juma (ijuma) merged 8 commits into
masterfrom
ccs-master-merge-3.3-branching-point

Conversation

@ijuma

Copy link
Copy Markdown
Member

$ git merge-base apache-github/3.3 apache-github/trunk
23c92ce

$ git show 23c92ce
commit 23c92ce
Author: SC pch838811@gmail.com
Date: Mon Jul 11 11:36:56 2022 +0900

MINOR: Use String#format for niceMemoryUnits result (apache#12389)

Reviewers: Luke Chen showuon@gmail.com, Divij Vaidya diviv@amazon.com

Committer Checklist (excluded from commit message)

  • Verify design and implementation
  • Verify test coverage and CI build status
  • Verify documentation (including upgrade notes)

vamossagar12 and others added 8 commits July 7, 2022 11:43
Reviewers: Guozhang Wang <wangguoz@gmail.com>
Reviewers: Luke Chen <showuon@gmail.com>, Andrew Eugene Choi <andrew.choi@uwaterloo.ca>, Matthias J. Sax <matthias@confluent.io>
…pache#12359)

Reviewers: Manikumar Reddy <manikumar.reddy@gmail.com>
…ically (apache#12296)

log.cleaner.io.max.bytes.per.second cannot be changed dynamically using bin/kafka-configs.sh. Call updateDesiredRatePerSec() of Throttler with new log.cleaner.io.max.bytes.per.second value in reconfigure() of Log Cleaner to fix the issue.

Reviewers: Tom Bentley <tbentley@redhat.com>, Luke Chen <showuon@gmail.com>
…ler connection (apache#12381)

What:
When a certificate is rotated on a broker via dynamic configuration and the previous certificate expires, the broker to controller connection starts failing with SSL Handshake failed.

Why:
A similar fix was earlier performed in apache#6721 but when BrokerToControllerChannelManager was introduced in v2.7, we didn't enable dynamic reconfiguration for it's channel.

Summary of testing strategy (including rationale)
Add a test which fails prior to the fix done in the PR and succeeds afterwards. The bug wasn't caught earlier because there was no test coverage to validate the scenario.

Reviewers: Luke Chen <showuon@gmail.com>
… the offset map (apache#12390)

When cleaning a topic with transactional data, if the keys used in the user data happen to conflict with the keys in the transaction markers, it is possible for the markers to get removed before the corresponding data from the transaction is removed. This results in a hanging transaction or the loss of the transaction's atomicity since it would effectively get bundled into the next transaction in the log. Currently control records are excluded when building the offset map, but not when doing the cleaning. This patch fixes the problem by checking for control batches in the `shouldRetainRecord` callback.

Reviewers: Jun Rao <junrao@gmail.com>
Reviewers: Luke Chen <showuon@gmail.com>, Divij Vaidya <diviv@amazon.com>
> $ git merge-base apache-github/3.3 apache-github/trunk
> 23c92ce

> $ git show 23c92ce
> commit 23c92ce
> Author: SC <pch838811@gmail.com>
> Date:   Mon Jul 11 11:36:56 2022 +0900
>
>    MINOR: Use String#format for niceMemoryUnits result (apache#12389)
>
>    Reviewers: Luke Chen <showuon@gmail.com>, Divij Vaidya <diviv@amazon.com>

* commit '23c92ce79366e86ca719e5e51c550c27324acd83':
  MINOR: Use String#format for niceMemoryUnits result (apache#12389)
  KAFKA-14055; Txn markers should not be removed by matching records in the offset map (apache#12390)
  KAFKA-13474: Allow reconfiguration of SSL certs for broker to controller connection (apache#12381)
  KAFKA-13996: log.cleaner.io.max.bytes.per.second can be changed dynamically (apache#12296)
  KAFKA-13983: Fail the creation with "/" in resource name in zk ACL (apache#12359)
  KAFKA-12943: update aggregating documentation (apache#12091)
  KAFKA-13846: Follow up PR to address review comments (apache#12297)
@ijuma
Ismael Juma (ijuma) requested a review from a team as a code owner August 3, 2022 20:59

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

LGTM. Verified those are the commits

@ijuma
Ismael Juma (ijuma) merged commit affe8cd into master Aug 4, 2022
@ijuma
Ismael Juma (ijuma) deleted the ccs-master-merge-3.3-branching-point branch August 4, 2022 13:32
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.

9 participants