Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[INLONG-7646][Audit] Fix NPE when mq configuration is not registered #7647

Merged
merged 2 commits into from
Mar 20, 2023
Merged

[INLONG-7646][Audit] Fix NPE when mq configuration is not registered #7647

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b47fc20
[INLONG-7646][Audit] Fix NPE when mq configuration is not registered
haifxu Mar 20, 2023
07bd623
[INLONG-7646][Audit] Add judgment condition
haifxu Mar 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions ...dit/audit-store/src/main/java/org/apache/inlong/audit/service/AuditMsgConsumerServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.apache.inlong.audit.service.consume.KafkaConsume;
import org.apache.inlong.audit.service.consume.PulsarConsume;
import org.apache.inlong.audit.service.consume.TubeConsume;
import org.apache.inlong.common.constant.MQType;
import org.apache.inlong.common.pojo.audit.AuditConfigRequest;
import org.apache.inlong.common.pojo.audit.MQInfo;
import org.slf4j.Logger;
Expand All @@ -45,7 +46,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
Expand All @@ -70,6 +70,9 @@ public class AuditMsgConsumerServer implements InitializingBean {

private static final String DEFAULT_CONFIG_PROPERTIES = "application.properties";

// interval time of getting mq config
private static final int INTERVAL_MS = 5000;

private final CloseableHttpClient httpClient = HttpClientBuilder.create().build();

private final Gson gson = new Gson();
Expand All @@ -83,24 +86,25 @@ public void afterPropertiesSet() {
List<InsertData> insertServiceList = this.getInsertServiceList();

for (MQInfo mqInfo : mqInfoList) {
if (mqConfig.isPulsar()) {
if (mqConfig.isPulsar() && MQType.PULSAR.equals(mqInfo.getMqType())) {
mqConfig.setPulsarServerUrl(mqInfo.getUrl());
mqConsume = new PulsarConsume(insertServiceList, storeConfig, mqConfig);
break;
} else if (mqConfig.isTube()) {
} else if (mqConfig.isTube() && MQType.TUBEMQ.equals(mqInfo.getMqType())) {
mqConfig.setTubeMasterList(mqInfo.getUrl());
mqConsume = new TubeConsume(insertServiceList, storeConfig, mqConfig);
break;
} else if (mqConfig.isKafka()) {
} else if (mqConfig.isKafka() && MQType.KAFKA.equals(mqInfo.getMqType())) {
mqConfig.setKafkaServerUrl(mqInfo.getUrl());
mqConsume = new KafkaConsume(insertServiceList, storeConfig, mqConfig);
break;
} else {
LOG.error("Unknown MessageQueue {}", mqConfig.getMqType());
return;
}
}

if (mqConsume == null) {
LOG.error("Unknown MessageQueue {}", mqConfig.getMqType());
}

if (storeConfig.isElasticsearchStore()) {
esService.startTimerRoutine();
}
Expand Down Expand Up @@ -133,19 +137,23 @@ private List<InsertData> getInsertServiceList() {

private List<MQInfo> getClusterFromManager() {
Properties properties = new Properties();
List<MQInfo> mqConfig;
try (InputStream inputStream = getClass().getClassLoader().getResourceAsStream(DEFAULT_CONFIG_PROPERTIES)) {
properties.load(inputStream);
String managerHosts = properties.getProperty("manager.hosts");
String clusterTag = properties.getProperty("proxy.cluster.tag");
String[] hostList = StringUtils.split(managerHosts, ",");
for (String host : hostList) {
List<MQInfo> mqConfig = getMQConfig(host, clusterTag);
if (ObjectUtils.isNotEmpty(mqConfig)) {
LOG.info("return mqConfig");
return mqConfig;
while (true) {
healchow marked this conversation as resolved.
Show resolved Hide resolved
mqConfig = getMQConfig(host, clusterTag);
if (ObjectUtils.isNotEmpty(mqConfig)) {
return mqConfig;
}
LOG.info("MQ config may not be registered yet, wait for 5s and try again");
Thread.sleep(INTERVAL_MS);
dockerzhang marked this conversation as resolved.
Show resolved Hide resolved
}
}
} catch (IOException e) {
} catch (Exception e) {
throw new RuntimeException(e);
}
return null;
Expand Down