database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[feature](profile )merge of profiles can be disabled by profile level. #29861

Browse Source 
The merging of profiles requires ensuring the correctness of the profiles themselves. However, if merging is intended for troubleshooting correctness issues through profiles, errors may occur.

Moreover, the 'try-catch' does not catch exceptions related to profile merging. If merging fails, even the normal profile cannot be obtained.
This commit is contained in:
Mryange
2024-01-11 21:04:30 +08:00
committed by yiguolei
parent 3ef1229635
commit acda8d2129
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
fe/fe-core/src/main/java/org/apache/doris/common/profile/Profile.java
View File

@ -42,6 +42,7 @@ import java.util.Map;
*/
public class Profile {
private static final Logger LOG = LogManager.getLogger(Profile.class);
private static final int MergedProfileLevel = 1;
private RuntimeProfile rootProfile;
private SummaryProfile summaryProfile;
private AggregatedProfile aggregatedProfile;
@ -49,6 +50,8 @@ public class Profile {
private boolean isFinished;
private Map<Integer, String> planNodeMap;
private int profileLevel = 3;
public Profile(String name, boolean isEnable) {
this.rootProfile = new RuntimeProfile(name);
this.summaryProfile = new SummaryProfile(rootProfile);
@ -86,6 +89,7 @@ public class Profile {
rootProfile.setIsPipelineX(isPipelineX);
ProfileManager.getInstance().pushProfile(this);
this.isFinished = isFinished;
this.profileLevel = profileLevel;
} catch (Throwable t) {
LOG.warn("update profile failed", t);
throw t;
@ -105,14 +109,21 @@ public class Profile {
// add summary to builder
summaryProfile.prettyPrint(builder);
LOG.info(builder.toString());
builder.append("\n MergedProfile \n");
aggregatedProfile.getAggregatedFragmentsProfile(planNodeMap).prettyPrint(builder, " ");
if (this.profileLevel == MergedProfileLevel) {
try {
builder.append("\n MergedProfile \n");
aggregatedProfile.getAggregatedFragmentsProfile(planNodeMap).prettyPrint(builder, " ");
} catch (Throwable aggProfileException) {
LOG.warn("build merged simple profile failed", aggProfileException);
builder.append("build merged simple profile failed");
}
}
try {
builder.append("\n");
executionProfile.getExecutionProfile().prettyPrint(builder, "");
} catch (Throwable aggProfileException) {
LOG.warn("build merged simple profile failed", aggProfileException);
builder.append("build merged simple profile failed");
LOG.warn("build profile failed", aggProfileException);
builder.append("build profile failed");
}
return builder.toString();
}

2
fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
View File

@ -715,7 +715,7 @@ public class SessionVariable implements Serializable, Writable {
public int parallelPipelineTaskNum = 0;
@VariableMgr.VarAttr(name = PROFILE_LEVEL, fuzzy = true)
public int profileLevel = 3;
public int profileLevel = 1;
@VariableMgr.VarAttr(name = MAX_INSTANCE_NUM)
public int maxInstanceNum = 64;