[kafka] branch trunk updated (6d36db1c78f -> beb0be5fe45)
This is an automated email from the ASF dual-hosted git repository. guozhang pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/kafka.git from 6d36db1c78f KAFKA-14765 and KAFKA-14776: Support for SCRAM at bootstrap with integration tests (#13374) add beb0be5fe45 KAFKA-14533: Do not interrupt state-updater thread during shutdown (#13318) No new revisions were added by this update. Summary of changes: .../org/apache/kafka/streams/KafkaStreams.java | 2 +- .../streams/processor/internals/ClientUtils.java | 36 ++ .../processor/internals/DefaultStateUpdater.java | 57 +- .../internals/StreamsPartitionAssignor.java| 17 --- .../streams/processor/internals/TaskManager.java | 2 + .../SmokeTestDriverIntegrationTest.java| 3 +- ...ghAvailabilityStreamsPartitionAssignorTest.java | 39 +++ .../RackAwarenessStreamsPartitionAssignorTest.java | 35 +++-- .../internals/StreamsPartitionAssignorTest.java| 19 +++- .../internals/assignment/AssignmentTestUtils.java | 19 +++- 10 files changed, 112 insertions(+), 117 deletions(-)
Failed to parse .asf.yaml in kafka!
Found unknown feature entry 'jenkins' in .asf.yaml!
Failed to parse .asf.yaml in kafka!
Found unknown feature entry 'jenkins' in .asf.yaml!
[kafka] branch trunk updated: KAFKA-14765 and KAFKA-14776: Support for SCRAM at bootstrap with integration tests (#13374)
This is an automated email from the ASF dual-hosted git repository.
cmccabe pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6d36db1c78f KAFKA-14765 and KAFKA-14776: Support for SCRAM at
bootstrap with integration tests (#13374)
6d36db1c78f is described below
commit 6d36db1c78ff28ed3e6134e271e72a5c2ff1c276
Author: Proven Provenzano <93720617+pprovenz...@users.noreply.github.com>
AuthorDate: Tue Apr 4 11:34:09 2023 -0400
KAFKA-14765 and KAFKA-14776: Support for SCRAM at bootstrap with
integration tests (#13374)
Implement KIP-900
Update kafka-storage to be able to add SCRAM records to the bootstrap
metadata file at format time so that SCRAM is enabled at initial start
(bootstrap) of KRaft cluster. Includes unit tests.
Update
./core/src/test/scala/integration/kafka/api/SaslScramSslEndToEndAuthorizationTest.scala
to use bootstrap and
enable the test to run with both ZK and KRaft quorum.
Moved the one test from ScramServerStartupTest.scala into
SaslScramSslEndToEndAuthorizationTest.scala. This test is really small, so
there was no point in recreating all the bootstrap startup just for a 5 line
test when it could easily be run elsewhere.
Reviewers: Colin P. McCabe , Manikumar Reddy
---
.../apache/kafka/clients/admin/ScramMechanism.java | 5 +
.../security/scram/internals/ScramMechanism.java | 34 +++-
core/src/main/scala/kafka/tools/StorageTool.scala | 186 +++--
.../kafka/api/CustomQuotaCallbackTest.scala| 4 +-
.../DelegationTokenEndToEndAuthorizationTest.scala | 4 +-
.../api/DescribeAuthorizedOperationsTest.scala | 2 +-
.../SaslClientsWithInvalidCredentialsTest.scala| 4 +-
.../SaslScramSslEndToEndAuthorizationTest.scala| 46 -
.../scala/integration/kafka/api/SaslSetup.scala| 16 +-
.../kafka/api/SaslSslAdminIntegrationTest.scala| 2 +-
.../kafka/server/QuorumTestHarness.scala | 23 ++-
.../kafka/server/ScramServerStartupTest.scala | 65 ---
.../admin/UserScramCredentialsCommandTest.scala| 44 ++---
.../kafka/integration/KafkaServerTestHarness.scala | 4 +-
.../scala/unit/kafka/tools/StorageToolTest.scala | 148 +++-
15 files changed, 456 insertions(+), 131 deletions(-)
diff --git
a/clients/src/main/java/org/apache/kafka/clients/admin/ScramMechanism.java
b/clients/src/main/java/org/apache/kafka/clients/admin/ScramMechanism.java
index 95ad18c04c9..5c5e371529e 100644
--- a/clients/src/main/java/org/apache/kafka/clients/admin/ScramMechanism.java
+++ b/clients/src/main/java/org/apache/kafka/clients/admin/ScramMechanism.java
@@ -23,6 +23,11 @@ import java.util.Arrays;
* Representation of a SASL/SCRAM Mechanism.
*
* @see https://cwiki.apache.org/confluence/display/KAFKA/KIP-554%3A+Add+Broker-side+SCRAM+Config+API;>KIP-554:
Add Broker-side SCRAM Config API
+ *
+ * This code is duplicated in
org.apache.kafka.common.security.scram.internals.ScramMechanism.
+ * The type field in both files must match and must not change. The type field
+ * is used both for passing ScramCredentialUpsertion and for the internal
+ * UserScramCredentialRecord. Do not change the type field.
*/
public enum ScramMechanism {
UNKNOWN((byte) 0),
diff --git
a/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramMechanism.java
b/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramMechanism.java
index 9f6e69d9c5e..6ba78b4a4f4 100644
---
a/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramMechanism.java
+++
b/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramMechanism.java
@@ -21,15 +21,23 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+/*
+ * This code is duplicated in org.apache.kafka.clients.admin.ScramMechanism.
+ * The type field in both files must match and must not change. The type field
+ * is used both for passing ScramCredentialUpsertion and for the internal
+ * UserScramCredentialRecord. Do not change the type field.
+ */
public enum ScramMechanism {
-SCRAM_SHA_256("SHA-256", "HmacSHA256", 4096),
-SCRAM_SHA_512("SHA-512", "HmacSHA512", 4096);
+SCRAM_SHA_256((byte) 1, "SHA-256", "HmacSHA256", 4096, 16384),
+SCRAM_SHA_512((byte) 2, "SHA-512", "HmacSHA512", 4096, 16384);
+private final byte type;
private final String mechanismName;
private final String hashAlgorithm;
private final String macAlgorithm;
private final int minIterations;
+private final int maxIterations;
private static final Map MECHANISMS_MAP;
@@ -40,11 +48,19 @@ public enum ScramMechanism {
MECHANISMS_MAP = Collections.unmodifiableMap(map);
}
-ScramMechanism(String hashAlgorithm, String macAlgorithm, int
minIterations) {
+ScramMechanism(
+
Failed to parse .asf.yaml in kafka!
Found unknown feature entry 'jenkins' in .asf.yaml!
[kafka] branch 3.3 updated: MINOR: Fix base ConfigDef in AbstractHerder::connectorPluginConfig (#13466)
This is an automated email from the ASF dual-hosted git repository.
mimaison pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/3.3 by this push:
new f50020f3f3c MINOR: Fix base ConfigDef in
AbstractHerder::connectorPluginConfig (#13466)
f50020f3f3c is described below
commit f50020f3f3c519f9c9b2321882aa0ff1fd4d9413
Author: Chris Egerton
AuthorDate: Tue Apr 4 02:57:42 2023 -0700
MINOR: Fix base ConfigDef in AbstractHerder::connectorPluginConfig (#13466)
Reviewers: Mickael Maison , Greg Harris
---
.../src/main/java/org/apache/kafka/connect/runtime/AbstractHerder.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/AbstractHerder.java
b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/AbstractHerder.java
index 879aabe06c3..02e4b8950a7 100644
---
a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/AbstractHerder.java
+++
b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/AbstractHerder.java
@@ -806,7 +806,7 @@ public abstract class AbstractHerder implements Herder,
TaskStatus.Listener, Con
ConfigDef pluginConfigDefs;
switch (pluginType) {
case SINK:
-baseConfigDefs = SourceConnectorConfig.configDef();
+baseConfigDefs = SinkConnectorConfig.configDef();
pluginConfigDefs = ((SinkConnector) plugin).config();
break;
case SOURCE:
Failed to parse .asf.yaml in kafka!
Found unknown feature entry 'jenkins' in .asf.yaml!
[kafka] branch 3.4 updated: MINOR: Fix base ConfigDef in AbstractHerder::connectorPluginConfig (#13466)
This is an automated email from the ASF dual-hosted git repository.
mimaison pushed a commit to branch 3.4
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/3.4 by this push:
new 699c3511a7a MINOR: Fix base ConfigDef in
AbstractHerder::connectorPluginConfig (#13466)
699c3511a7a is described below
commit 699c3511a7a230dc450b0f5f27e67785fa1c7983
Author: Chris Egerton
AuthorDate: Tue Apr 4 02:57:42 2023 -0700
MINOR: Fix base ConfigDef in AbstractHerder::connectorPluginConfig (#13466)
Reviewers: Mickael Maison , Greg Harris
---
.../src/main/java/org/apache/kafka/connect/runtime/AbstractHerder.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/AbstractHerder.java
b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/AbstractHerder.java
index 5f3c1a23bb5..51eaaceb86b 100644
---
a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/AbstractHerder.java
+++
b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/AbstractHerder.java
@@ -812,7 +812,7 @@ public abstract class AbstractHerder implements Herder,
TaskStatus.Listener, Con
ConfigDef pluginConfigDefs;
switch (pluginType) {
case SINK:
-baseConfigDefs = SourceConnectorConfig.configDef();
+baseConfigDefs = SinkConnectorConfig.configDef();
pluginConfigDefs = ((SinkConnector) plugin).config();
break;
case SOURCE:
[kafka] branch trunk updated: MINOR: Fix base ConfigDef in AbstractHerder::connectorPluginConfig (#13466)
This is an automated email from the ASF dual-hosted git repository.
mimaison pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new 5e820571de1 MINOR: Fix base ConfigDef in
AbstractHerder::connectorPluginConfig (#13466)
5e820571de1 is described below
commit 5e820571de11d7157262c8bc6bbb59402a700ca5
Author: Chris Egerton
AuthorDate: Tue Apr 4 02:57:42 2023 -0700
MINOR: Fix base ConfigDef in AbstractHerder::connectorPluginConfig (#13466)
Reviewers: Mickael Maison , Greg Harris
---
.../src/main/java/org/apache/kafka/connect/runtime/AbstractHerder.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/AbstractHerder.java
b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/AbstractHerder.java
index 62e5011ca6e..125b93dab73 100644
---
a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/AbstractHerder.java
+++
b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/AbstractHerder.java
@@ -842,7 +842,7 @@ public abstract class AbstractHerder implements Herder,
TaskStatus.Listener, Con
ConfigDef pluginConfigDefs;
switch (pluginType) {
case SINK:
-baseConfigDefs = SourceConnectorConfig.configDef();
+baseConfigDefs = SinkConnectorConfig.configDef();
pluginConfigDefs = ((SinkConnector) plugin).config();
break;
case SOURCE:
Failed to parse .asf.yaml in kafka!
Found unknown feature entry 'jenkins' in .asf.yaml!
