Skip to content

AK to CCS merge 10-08-2020#425

Merged
Matthew Wong (mattwong949) merged 7 commits into
confluentinc:masterfrom
apache:Merge_AK_to_CCS_10_08_2020
Oct 13, 2020
Merged

AK to CCS merge 10-08-2020#425
Matthew Wong (mattwong949) merged 7 commits into
confluentinc:masterfrom
apache:Merge_AK_to_CCS_10_08_2020

Conversation

@bbejeck

@bbejeck Bill Bejeck (bbejeck) commented Oct 8, 2020

Copy link
Copy Markdown

This PR includes the commits related to AK 2.7 branch cutting and subsequent commits afterward

Committer Checklist (excluded from commit message)

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

Bill Bejeck (bbejeck) and others added 7 commits October 8, 2020 07:47
Implements KIP-617 for `SessionStore`

Reviewers: A. Sophie Blee-Goldman <sophie@confluent.io>, John Roesler <vvcephei@apache.org>
Reviewers: Mickael Maison <mickael.maison@gmail.com>, Lee Dongjin <dongjin@apache.org>
Reviewers: Mickael Maison <mickael.maison@gmail.com>, Lee Dongjin <dongjin@apache.org>
…9393)

In this PR, I have addressed the review comments from @chia7712 in #9001 which were provided after #9001 was merged. The changes are made mainly to KafkaAdminClient:

Improve error message in updateFeatures api when feature name is empty.
Propagate top-level error message in updateFeatures api.
Add an empty-parameter variety for describeFeatures api.
Minor documentation updates to @param and @return to make these resemble other apis.

Reviewers: Chia-Ping Tsai chia7712@gmail.com, Jun Rao junrao@gmail.com
…e partition (#9020)

StreamThreadStateStoreProvider excessive loop over calling internalTopologyBuilder.topicGroups(), which is synchronized, thus causing significant performance degradation to the caller, especially when store has many partitions.

Reviewers: John Roesler <vvcephei@apache.org>, Guozhang Wang <wangguoz@gmail.com>
@bbejeck

Copy link
Copy Markdown
Author

ping one of Bob Barrett (@bob-barrett) Ismael Juma (@ijuma) for review.

@bbejeck Bill Bejeck (bbejeck) left a comment

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

I've added comments on the files that are related to the 2.7 release. Everything else is just a merge from AK and probably doesn't require reviewing.

Comment thread docs/js/templateData.js
"version": "27",
"dotVersion": "2.7",
"fullDotVersion": "2.7.0",
"version": "28",

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

updates for the new release

Comment thread gradle.properties
# - tests/kafkatest/version.py (variable DEV_VERSION)
# - kafka-merge-pr.py
version=6.1.0-0-ccs

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

updates for the 2.7 release

Comment thread kafka-merge-pr.py
DEV_BRANCH_NAME = "trunk"

DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "2.7.0")
DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "2.8.0")

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

same here

<groupId>org.apache.kafka</groupId>
<artifactId>streams-quickstart</artifactId>
<version>6.1.0-0-ccs</version>
<version>6.2.0-0-ccs</version>

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

ditto

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<kafka.version>6.1.0-0-ccs</kafka.version>
<kafka.version>6.2.0-0-ccs</kafka.version>

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

ditto

<artifactId>streams-quickstart</artifactId>
<packaging>pom</packaging>
<version>6.1.0-0-ccs</version>
<version>6.2.0-0-ccs</version>

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

ditto


# For example, when Kafka is at version 1.0.0-0, this should be something like "1.0.0-0.dev0"
__version__ = '6.1.0-0.dev0'
__version__ = '6.2.0-0.dev0'

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

more updates for the new release


DEV_BRANCH = KafkaVersion("dev")
DEV_VERSION = KafkaVersion("6.1.0-0")
DEV_VERSION = KafkaVersion("6.2.0-0")

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

release related update

@bob-barrett Bob Barrett (bob-barrett) left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Checked that the version bump changes LGTM. As you suggested, I didn't review the rest of the changes since they're an upstream merge.

@mattwong949 Matthew Wong (mattwong949) merged commit af35402 into confluentinc:master Oct 13, 2020
@ijuma Ismael Juma (ijuma) deleted the Merge_AK_to_CCS_10_08_2020 branch October 15, 2020 07:47
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.

7 participants