Skip to content

Commit

Permalink
[opt](fe) Optimize calculate load job num metric in FE (#39268)
Browse files Browse the repository at this point in the history 
cherry pick from #31952
#34020
Co-authored-by: Lei Zhang <[email protected]>
  • Loading branch information
@htyoung
htyoung authored Aug 13, 2024
1 parent 61e5874 commit ab2d94f
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 26 deletions.
61 changes: 39 additions & 22 deletions fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.apache.doris.common.DdlException;
import org.apache.doris.common.LabelAlreadyUsedException;
import org.apache.doris.common.MetaNotFoundException;
import org.apache.doris.common.Pair;
import org.apache.doris.common.PatternMatcher;
import org.apache.doris.common.PatternMatcherWrapper;
import org.apache.doris.common.UserException;
Expand All @@ -51,7 +52,8 @@
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.StopWatch;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

Expand All @@ -69,6 +71,7 @@
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.function.Predicate;
import java.util.stream.Collectors;

/**
Expand Down Expand Up @@ -324,6 +327,11 @@ public void replayEndLoadJob(LoadJobFinalOperation operation) {
job.unprotectReadEndOperation(operation);
LOG.info(new LogBuilder(LogKey.LOAD_JOB, operation.getId()).add("operation", operation)
.add("msg", "replay end load job").build());

// When idToLoadJob size increase 10000 roughly, we run removeOldLoadJob to reduce mem used
if ((!idToLoadJob.isEmpty()) && (idToLoadJob.size() % 10000 == 0)) {
removeOldLoadJob();
}
}

/**
Expand Down Expand Up @@ -362,45 +370,54 @@ public int getLoadJobNum(JobState jobState, long dbId) {
/**
* Get load job num, used by metric.
**/
public long getLoadJobNum(JobState jobState, EtlJobType jobType) {
readLock();
try {
return idToLoadJob.values().stream().filter(j -> j.getState() == jobState && j.getJobType() == jobType)
.count();
} finally {
readUnlock();
}
public Map<Pair<EtlJobType, JobState>, Long> getLoadJobNum() {
return idToLoadJob.values().stream().collect(Collectors.groupingBy(
loadJob -> Pair.of(loadJob.getJobType(), loadJob.getState()),
Collectors.counting()));
}

/**
* Remove old load job.
**/
public void removeOldLoadJob() {
long currentTimeMs = System.currentTimeMillis();
removeLoadJobIf(job -> job.isExpired(currentTimeMs));
}

private void jobRemovedTrigger(LoadJob job) {
Map<String, List<LoadJob>> map = dbIdToLabelToLoadJobs.get(job.getDbId());
List<LoadJob> list = map.get(job.getLabel());
list.remove(job);
if (job instanceof SparkLoadJob) {
((SparkLoadJob) job).clearSparkLauncherLog();
}
if (list.isEmpty()) {
map.remove(job.getLabel());
}
if (map.isEmpty()) {
dbIdToLabelToLoadJobs.remove(job.getDbId());
}
}

private void removeLoadJobIf(Predicate<LoadJob> pred) {
long removeJobNum = 0;
StopWatch stopWatch = StopWatch.createStarted();
writeLock();
try {
Iterator<Map.Entry<Long, LoadJob>> iter = idToLoadJob.entrySet().iterator();
while (iter.hasNext()) {
LoadJob job = iter.next().getValue();
if (job.isExpired(currentTimeMs)) {
if (pred.test(job)) {
iter.remove();
Map<String, List<LoadJob>> map = dbIdToLabelToLoadJobs.get(job.getDbId());
List<LoadJob> list = map.get(job.getLabel());
list.remove(job);
if (job instanceof SparkLoadJob) {
((SparkLoadJob) job).clearSparkLauncherLog();
}
if (list.isEmpty()) {
map.remove(job.getLabel());
}
if (map.isEmpty()) {
dbIdToLabelToLoadJobs.remove(job.getDbId());
}
jobRemovedTrigger(job);
removeJobNum++;
}
}
} finally {
writeUnlock();
stopWatch.stop();
LOG.info("end to removeOldLoadJob, removeJobNum:{} cost:{} ms",
removeJobNum, stopWatch.getTime());
}
}

Expand Down
23 changes: 19 additions & 4 deletions fe/fe-core/src/main/java/org/apache/doris/metric/MetricRepo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.apache.doris.catalog.Env;
import org.apache.doris.catalog.TabletInvertedIndex;
import org.apache.doris.common.Config;
import org.apache.doris.common.Pair;
import org.apache.doris.common.ThreadPoolManager;
import org.apache.doris.load.EtlJobType;
import org.apache.doris.load.loadv2.JobState;
Expand All @@ -41,6 +42,7 @@

import com.codahale.metrics.Histogram;
import com.codahale.metrics.MetricRegistry;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand Down Expand Up @@ -122,6 +124,7 @@ public final class MetricRepo {
public static GaugeMetricImpl<Double> GAUGE_REQUEST_PER_SECOND;
public static GaugeMetricImpl<Double> GAUGE_QUERY_ERR_RATE;
public static GaugeMetricImpl<Long> GAUGE_MAX_TABLET_COMPACTION_SCORE;
private static Map<Pair<EtlJobType, JobState>, Long> loadJobNum = Maps.newHashMap();

private static ScheduledThreadPoolExecutor metricTimer = ThreadPoolManager.newDaemonScheduledThreadPool(1,
"metric-timer-pool", true);
Expand All @@ -134,7 +137,6 @@ public static synchronized void init() {
}

// load jobs
LoadManager loadManger = Env.getCurrentEnv().getLoadManager();
for (EtlJobType jobType : EtlJobType.values()) {
if (jobType == EtlJobType.UNKNOWN) {
continue;
Expand All @@ -146,7 +148,7 @@ public Long getValue() {
if (!Env.getCurrentEnv().isMaster()) {
return 0L;
}
return loadManger.getLoadJobNum(state, jobType);
return MetricRepo.getLoadJobNum(jobType, state);
}
};
gauge.addLabel(new MetricLabel("job", "load")).addLabel(new MetricLabel("type", jobType.name()))
Expand Down Expand Up @@ -632,19 +634,23 @@ public static synchronized String getMetric(MetricVisitor visitor) {
// update the metrics first
updateMetrics();

// update load job metrics
updateLoadJobMetrics();

StringBuilder sb = new StringBuilder();

// jvm
JvmService jvmService = new JvmService();
JvmStats jvmStats = jvmService.stats();
visitor.visitJvm(sb, jvmStats);

visitor.setMetricNumber(DORIS_METRIC_REGISTER.getAllMetricSize());
// doris metrics
for (Metric metric : DORIS_METRIC_REGISTER.getMetrics()) {
for (Metric<?> metric : DORIS_METRIC_REGISTER.getMetrics()) {
visitor.visit(sb, MetricVisitor.FE_PREFIX, metric);
}
// system metric
for (Metric metric : DORIS_METRIC_REGISTER.getSystemMetrics()) {
for (Metric<?> metric : DORIS_METRIC_REGISTER.getSystemMetrics()) {
visitor.visit(sb, MetricVisitor.SYS_PREFIX, metric);
}

Expand Down Expand Up @@ -677,4 +683,13 @@ private static void updateMetrics() {
public static synchronized List<Metric> getMetricsByName(String name) {
return DORIS_METRIC_REGISTER.getMetricsByName(name);
}

private static void updateLoadJobMetrics() {
LoadManager loadManager = Env.getCurrentEnv().getLoadManager();
MetricRepo.loadJobNum = loadManager.getLoadJobNum();
}

private static long getLoadJobNum(EtlJobType jobType, JobState jobState) {
return MetricRepo.loadJobNum.getOrDefault(Pair.of(jobType, jobState), 0L);
}
}

0 comments on commit ab2d94f

Please sign in to comment.