[kafka] branch 2.6 updated: KAFKA-12326: Corrected regresion in MirrorMaker 2 executable introduced with KAFKA-10021 (#10122)

[rhauch]

This is an automated email from the ASF dual-hosted git repository.

rhauch pushed a commit to branch 2.6
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/2.6 by this push:
     new 64ea566  KAFKA-12326: Corrected regresion in MirrorMaker 2 executable 
introduced with KAFKA-10021 (#10122)
64ea566 is described below

commit 64ea5667aae03b1f17aabba8b82e2b6489769fda
Author: Randall Hauch <rha...@gmail.com>
AuthorDate: Fri Feb 12 16:53:29 2021 -0600

    KAFKA-12326: Corrected regresion in MirrorMaker 2 executable introduced 
with KAFKA-10021 (#10122)
    
    Fixes the recent change to the `MirrorMaker` class (used only in the 
MirrorMaker 2 executable) that uses a `SharedTopicAdmin` client as part of 
Connect, so that the correct properties into the `SharedTopicAdmin`.
    
    Author: Randall Hauch <rha...@gmail.com>
    Reviewer: Konstantine Karantasis <konstant...@confluent.io>
---
 .../src/main/java/org/apache/kafka/connect/mirror/MirrorMaker.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorMaker.java 
b/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorMaker.java
index 839f5dc..2dccb77 100644
--- 
a/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorMaker.java
+++ 
b/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorMaker.java
@@ -235,7 +235,7 @@ public class MirrorMaker {
         DistributedConfig distributedConfig = new 
DistributedConfig(workerProps);
         String kafkaClusterId = 
ConnectUtils.lookupKafkaClusterId(distributedConfig);
         // Create the admin client to be shared by all backing stores for this 
herder
-        Map<String, Object> adminProps = new HashMap<>(config.originals());
+        Map<String, Object> adminProps = new 
HashMap<>(distributedConfig.originals());
         ConnectUtils.addMetricsContextProperties(adminProps, 
distributedConfig, kafkaClusterId);
         SharedTopicAdmin sharedAdmin = new SharedTopicAdmin(adminProps);
         KafkaOffsetBackingStore offsetBackingStore = new 
KafkaOffsetBackingStore(sharedAdmin);