From d82d48da877f63a951cef83ddb44ec8adde9fe22 Mon Sep 17 00:00:00 2001 From: "Yunfeng,Wu" Date: Mon, 29 Jun 2020 14:13:07 +0800 Subject: [PATCH] [Doris On ES][Bug-fix] Sync ES metadata failure after restart or upgrade FE (#3961) ISSUE:#3960 PR #3454 introduce the caching for EsClient, but the initialization of the client was only during editlog replay, all this work should done also during image replay. This happens when restart or upgrade FE BTW: modify a UT failure for metric --- .../org/apache/doris/external/elasticsearch/EsRepository.java | 2 +- fe/src/test/java/org/apache/doris/metric/MetricsTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fe/src/main/java/org/apache/doris/external/elasticsearch/EsRepository.java b/fe/src/main/java/org/apache/doris/external/elasticsearch/EsRepository.java index fe574ce5b7..2cfcf4cdb2 100644 --- a/fe/src/main/java/org/apache/doris/external/elasticsearch/EsRepository.java +++ b/fe/src/main/java/org/apache/doris/external/elasticsearch/EsRepository.java @@ -93,7 +93,7 @@ public class EsRepository extends MasterDaemon { List tables = database.getTables(); for (Table table : tables) { if (table.getType() == TableType.ELASTICSEARCH) { - esTables.put(table.getId(), (EsTable) table); + registerTable((EsTable) table); } } } diff --git a/fe/src/test/java/org/apache/doris/metric/MetricsTest.java b/fe/src/test/java/org/apache/doris/metric/MetricsTest.java index b2e9fd6497..7ad28e2a84 100644 --- a/fe/src/test/java/org/apache/doris/metric/MetricsTest.java +++ b/fe/src/test/java/org/apache/doris/metric/MetricsTest.java @@ -36,7 +36,7 @@ public class MetricsTest { @Test public void testTcpMetrics() { List metrics = MetricRepo.getMetricsByName("snmp"); - Assert.assertEquals(2, metrics.size()); + Assert.assertEquals(4, metrics.size()); for (Metric metric : metrics) { GaugeMetric gm = (GaugeMetric) metric; if (gm.getLabels().get(0).getValue().equals("tcp_retrans_segs")) {