yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-12-18 05:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(docker): start issue when there are multiple kafka brokers in bootstrap config (#2231)

Browse Source
This commit is contained in:
Dexter Lee 2021-03-12 11:26:49 -08:00 committed by GitHub
parent 81fa8d6129
commit 8d731b577e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/datahub-gms/start.sh
View File

@ -7,7 +7,7 @@ fi
dockerize \ dockerize \
-wait tcp://$EBEAN_DATASOURCE_HOST \ -wait tcp://$EBEAN_DATASOURCE_HOST \
-wait tcp://$KAFKA_BOOTSTRAP_SERVER \ -wait tcp://$(echo $KAFKA_BOOTSTRAP_SERVER | sed 's/,/ -wait tcp:\/\//g') \
-wait http://$ELASTICSEARCH_HOST:$ELASTICSEARCH_PORT \ -wait http://$ELASTICSEARCH_HOST:$ELASTICSEARCH_PORT \
-wait $NEO4J_HOST \ -wait $NEO4J_HOST \
-timeout 240s \ -timeout 240s \

2
docker/datahub-mae-consumer/start.sh
View File

@ -6,7 +6,7 @@ if ! echo $NEO4J_HOST | grep -q "://" ; then
fi fi
dockerize \ dockerize \
-wait tcp://$KAFKA_BOOTSTRAP_SERVER \ -wait tcp://$(echo $KAFKA_BOOTSTRAP_SERVER | sed 's/,/ -wait tcp:\/\//g') \
-wait http://$ELASTICSEARCH_HOST:$ELASTICSEARCH_PORT \ -wait http://$ELASTICSEARCH_HOST:$ELASTICSEARCH_PORT \
-wait $NEO4J_HOST \ -wait $NEO4J_HOST \
-timeout 240s \ -timeout 240s \

2
docker/datahub-mce-consumer/start.sh
View File

@ -2,6 +2,6 @@
# -wait tcp://GMS_HOST:$GMS_PORT \ # -wait tcp://GMS_HOST:$GMS_PORT \
dockerize \ dockerize \
-wait tcp://$KAFKA_BOOTSTRAP_SERVER \ -wait tcp://$(echo $KAFKA_BOOTSTRAP_SERVER | sed 's/,/ -wait tcp:\/\//g') \
-timeout 240s \ -timeout 240s \
java -jar /datahub/datahub-mce-consumer/bin/mce-consumer-job.jar java -jar /datahub/datahub-mce-consumer/bin/mce-consumer-job.jar

3
metadata-jobs/mae-consumer-job/src/main/java/com/linkedin/metadata/kafka/config/KafkaConfig.java
View File

@ -3,6 +3,7 @@ package com.linkedin.metadata.kafka.config;
import io.confluent.kafka.serializers.AbstractKafkaAvroSerDeConfig; import io.confluent.kafka.serializers.AbstractKafkaAvroSerDeConfig;
import io.confluent.kafka.serializers.KafkaAvroDeserializer; import io.confluent.kafka.serializers.KafkaAvroDeserializer;
import java.time.Duration; import java.time.Duration;
import java.util.Arrays;
import java.util.Map; import java.util.Map;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.avro.generic.GenericRecord; import org.apache.avro.generic.GenericRecord;
@ -40,7 +41,7 @@ public class KafkaConfig {
// KAFKA_BOOTSTRAP_SERVER has precedence over SPRING_KAFKA_BOOTSTRAP_SERVERS // KAFKA_BOOTSTRAP_SERVER has precedence over SPRING_KAFKA_BOOTSTRAP_SERVERS
if (kafkaBootstrapServer != null && kafkaBootstrapServer.length() > 0) { if (kafkaBootstrapServer != null && kafkaBootstrapServer.length() > 0) {
props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, kafkaBootstrapServer); props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, Arrays.asList(kafkaBootstrapServer.split(",")));
} // else we rely on KafkaProperties which defaults to localhost:9092 } // else we rely on KafkaProperties which defaults to localhost:9092
props.put(AbstractKafkaAvroSerDeConfig.SCHEMA_REGISTRY_URL_CONFIG, kafkaSchemaRegistryUrl); props.put(AbstractKafkaAvroSerDeConfig.SCHEMA_REGISTRY_URL_CONFIG, kafkaSchemaRegistryUrl);