Skip to content

[Bug] fix finished load jobs cost too much heap #4993

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

Merged
EmmyMiao87 merged 2 commits into from
Dec 2, 2020
Merged

[Bug] fix finished load jobs cost too much heap #4993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9dac68
fix finished load jobs cost too much heap bug.
qidaye Dec 1, 2020
594715b
optimize import
qidaye Dec 1, 2020
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
2 changes: 2 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,6 +659,8 @@ private void executeFinish() {
if (MetricRepo.isInit) {
MetricRepo.COUNTER_LOAD_FINISHED.increase(1L);
}
// when load job finished, there is no need to hold the tasks which are the biggest memory consumers.
idToTasks.clear();
}

protected boolean checkDataQuality() {
Expand Down
6 changes: 5 additions & 1 deletion fe/fe-core/src/test/java/org/apache/doris/load/loadv2/LoadJobTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@
import com.google.common.collect.Maps;

import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;

import java.util.Map;

import mockit.Expectations;
import mockit.Injectable;
import mockit.Mocked;

public class LoadJobTest {
Expand Down Expand Up @@ -187,18 +187,22 @@ public void testUpdateStateToLoading() {

@Test
public void testUpdateStateToFinished(@Mocked MetricRepo metricRepo,
@Injectable LoadTask loadTask1,
@Mocked LongCounterMetric longCounterMetric) {

MetricRepo.COUNTER_LOAD_FINISHED = longCounterMetric;
LoadJob loadJob = new BrokerLoadJob();
loadJob.idToTasks.put(1L, loadTask1);

// TxnStateCallbackFactory factory = Catalog.getCurrentCatalog().getGlobalTransactionMgr().getCallbackFactory();
Catalog catalog = Catalog.getCurrentCatalog();
GlobalTransactionMgr mgr = new GlobalTransactionMgr(catalog);
Deencapsulation.setField(catalog, "globalTransactionMgr", mgr);
Assert.assertEquals(1, loadJob.idToTasks.size());
loadJob.updateState(JobState.FINISHED);
Assert.assertEquals(JobState.FINISHED, loadJob.getState());
Assert.assertNotEquals(-1, (long) Deencapsulation.getField(loadJob, "finishTimestamp"));
Assert.assertEquals(100, (int)Deencapsulation.getField(loadJob, "progress"));
Assert.assertEquals(0, loadJob.idToTasks.size());
}
}