Skip to content

Commit 691c69b

Browse files
author
宋光璠
committed
fix1225
1 parent e1c7325 commit 691c69b

File tree

2 files changed

+132
-2
lines changed

2 files changed

+132
-2
lines changed

‎fe/fe-core/src/main/java/org/apache/doris/common/profile/SummaryProfile.java‎

Lines changed: 132 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,19 @@ public class SummaryProfile {
150150
WORKLOAD_GROUP,
151151
CPU_SHARE,
152152
MEMORY_LIMIT,
153+
ENABLE_MEMORY_OVERCOMMIT,
154+
MAX_CONCURRENCY,
155+
MAX_QUEUE_SIZE,
156+
QUEUE_TIMEOUT,
157+
CPU_HARD_LIMIT,
158+
SCAN_THREAD_NUM,
159+
MAX_REMOTE_SCAN_THREAD_NUM,
160+
MIN_REMOTE_SCAN_THREAD_NUM,
161+
MEMORY_LOW_WATERMARK,
162+
MEMORY_HIGH_WATERMARK,
163+
TAG,
164+
READ_BYTES_PER_SECOND,
165+
REMOTE_READ_BYTES_PER_SECOND,
153166
PARSE_SQL_TIME,
154167
PLAN_TIME,
155168
NEREIDS_GARBAGE_COLLECT_TIME,
@@ -241,6 +254,19 @@ public class SummaryProfile {
241254
.put(HMS_UPDATE_PARTITION_CNT, 2)
242255
.put(CPU_SHARE, 1)
243256
.put(MEMORY_LIMIT, 1)
257+
.put(ENABLE_MEMORY_OVERCOMMIT, 1)
258+
.put(MAX_CONCURRENCY, 1)
259+
.put(MAX_QUEUE_SIZE, 1)
260+
.put(QUEUE_TIMEOUT, 1)
261+
.put(CPU_HARD_LIMIT, 1)
262+
.put(SCAN_THREAD_NUM, 1)
263+
.put(MAX_REMOTE_SCAN_THREAD_NUM, 1)
264+
.put(MIN_REMOTE_SCAN_THREAD_NUM, 1)
265+
.put(MEMORY_LOW_WATERMARK, 1)
266+
.put(MEMORY_HIGH_WATERMARK, 1)
267+
.put(TAG, 1)
268+
.put(READ_BYTES_PER_SECOND, 1)
269+
.put(REMOTE_READ_BYTES_PER_SECOND, 1)
244270
.build();
245271

246272
@SerializedName(value = "summaryProfile")
@@ -371,6 +397,32 @@ public class SummaryProfile {
371397
private int cpuShare = 0;
372398
@SerializedName(value = "memoryLimit")
373399
private double memoryLimit = 0.0;
400+
@SerializedName("enableMemoryOvercommit")
401+
private boolean enableMemoryOvercommit = true;
402+
@SerializedName("maxConcurrency")
403+
private int maxConcurrency = Integer.MAX_VALUE;
404+
@SerializedName("maxQueueSize")
405+
private int maxQueueSize = 0;
406+
@SerializedName("queueTimeout")
407+
private int queueTimeout = 0;
408+
@SerializedName("cpuHardLimit")
409+
private int cpuHardLimit = -1;
410+
@SerializedName("scanThreadNum")
411+
private int scanThreadNum = -1;
412+
@SerializedName("maxRemoteScanThreadNum")
413+
private int maxRemoteScanThreadNum = -1;
414+
@SerializedName("minRemoteScanThreadNum")
415+
private int minRemoteScanThreadNum = -1;
416+
@SerializedName("memoryLowWatermark")
417+
private int memoryLowWatermark = 0;
418+
@SerializedName("memoryHighWatermark")
419+
private int memoryHighWatermark = 0;
420+
@SerializedName("tag")
421+
private String tag = "";
422+
@SerializedName("readBytesPerSecond")
423+
private long readBytesPerSecond = -1L;
424+
@SerializedName("remoteReadBytesPerSecond")
425+
private long remoteReadBytesPerSecond = -1L;
374426
// BE -> (RPC latency from FE to BE, Execution latency on bthread, Duration of doing work, RPC latency from BE
375427
// to FE)
376428
private Map<TNetworkAddress, List<Long>> rpcPhase1Latency;
@@ -518,7 +570,31 @@ private void updateExecutionSummaryProfile() {
518570
RuntimeProfile.printCounter(queryFetchResultConsumeTime, TUnit.TIME_MS));
519571
executionSummaryProfile.addInfoString(WRITE_RESULT_TIME,
520572
RuntimeProfile.printCounter(queryWriteResultConsumeTime, TUnit.TIME_MS));
521-
executionSummaryProfile.addInfoString(CPU_SHARE, RuntimeProfile.printCounter(cpuShare, TUnit.BYTES));
573+
executionSummaryProfile.addInfoString(CPU_SHARE, RuntimeProfile.printCounter(cpuShare, TUnit.NONE));
574+
executionSummaryProfile.addInfoString(CPU_HARD_LIMIT,
575+
RuntimeProfile.printCounter(cpuHardLimit, TUnit.NONE));
576+
executionSummaryProfile.addInfoString(MEMORY_LIMIT, memoryLimit + "%");
577+
executionSummaryProfile.addInfoString(MEMORY_LOW_WATERMARK, memoryLowWatermark + "%");
578+
executionSummaryProfile.addInfoString(MEMORY_HIGH_WATERMARK, memoryHighWatermark + "%");
579+
executionSummaryProfile.addInfoString(ENABLE_MEMORY_OVERCOMMIT,
580+
String.valueOf(enableMemoryOvercommit));
581+
executionSummaryProfile.addInfoString(MAX_CONCURRENCY,
582+
RuntimeProfile.printCounter(maxConcurrency, TUnit.NONE));
583+
executionSummaryProfile.addInfoString(MAX_QUEUE_SIZE,
584+
RuntimeProfile.printCounter(maxQueueSize, TUnit.NONE));
585+
executionSummaryProfile.addInfoString(QUEUE_TIMEOUT,
586+
RuntimeProfile.printCounter(queueTimeout, TUnit.TIME_MS));
587+
executionSummaryProfile.addInfoString(SCAN_THREAD_NUM,
588+
RuntimeProfile.printCounter(scanThreadNum, TUnit.NONE));
589+
executionSummaryProfile.addInfoString(MAX_REMOTE_SCAN_THREAD_NUM,
590+
RuntimeProfile.printCounter(maxRemoteScanThreadNum, TUnit.NONE));
591+
executionSummaryProfile.addInfoString(MIN_REMOTE_SCAN_THREAD_NUM,
592+
RuntimeProfile.printCounter(minRemoteScanThreadNum, TUnit.NONE));
593+
executionSummaryProfile.addInfoString(TAG, tag);
594+
executionSummaryProfile.addInfoString(READ_BYTES_PER_SECOND,
595+
RuntimeProfile.printCounter(readBytesPerSecond, TUnit.BYTES_PER_SECOND));
596+
executionSummaryProfile.addInfoString(REMOTE_READ_BYTES_PER_SECOND,
597+
RuntimeProfile.printCounter(remoteReadBytesPerSecond, TUnit.BYTES_PER_SECOND));
522598
setTransactionSummary();
523599

524600
if (Config.isCloudMode()) {
@@ -739,9 +815,64 @@ public void setCpuShare(int cpuShare) {
739815
this.cpuShare = cpuShare;
740816
}
741817

818+
742819
public void setMemoryLimit(double memoryLimit) {
743820
this.memoryLimit = memoryLimit;
744821
}
822+
823+
824+
public void setEnableMemoryOvercommit(boolean enableMemoryOvercommit) {
825+
this.enableMemoryOvercommit = enableMemoryOvercommit;
826+
}
827+
828+
public void setMaxConcurrency(int maxConcurrency) {
829+
this.maxConcurrency = maxConcurrency;
830+
}
831+
832+
public void setMaxQueueSize(int maxQueueSize) {
833+
this.maxQueueSize = maxQueueSize;
834+
}
835+
836+
public void setQueueTimeout(int queueTimeout) {
837+
this.queueTimeout = queueTimeout;
838+
}
839+
840+
public void setCpuHardLimit(int cpuHardLimit) {
841+
this.cpuHardLimit = cpuHardLimit;
842+
}
843+
844+
public void setScanThreadNum(int scanThreadNum) {
845+
this.scanThreadNum = scanThreadNum;
846+
}
847+
848+
public void setMaxRemoteScanThreadNum(int maxRemoteScanThreadNum) {
849+
this.maxRemoteScanThreadNum = maxRemoteScanThreadNum;
850+
}
851+
852+
public void setMinRemoteScanThreadNum(int minRemoteScanThreadNum) {
853+
this.minRemoteScanThreadNum = minRemoteScanThreadNum;
854+
}
855+
856+
public void setMemoryLowWatermark(int memoryLowWatermark) {
857+
this.memoryLowWatermark = memoryLowWatermark;
858+
}
859+
860+
public void setMemoryHighWatermark(int memoryHighWatermark) {
861+
this.memoryHighWatermark = memoryHighWatermark;
862+
}
863+
864+
public void setTag(String tag) {
865+
this.tag = tag;
866+
}
867+
868+
public void setReadBytesPerSecond(long readBytesPerSecond) {
869+
this.readBytesPerSecond = readBytesPerSecond;
870+
}
871+
872+
public void setRemoteReadBytesPerSecond(long remoteReadBytesPerSecond) {
873+
this.remoteReadBytesPerSecond = remoteReadBytesPerSecond;
874+
}
875+
745876
public static class SummaryBuilder {
746877
private Map<String, String> map = Maps.newHashMap();
747878

‎fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,6 @@ private Map<String, String> getSummaryInfo(boolean isFinished) {
350350
SummaryProfile summary = getSummaryProfile();
351351
summary.setCpuShare(wg.getMaxCpuPercent());
352352
summary.setMemoryLimit(wg.getMaxMemoryPercent());
353-
summary.setEnableMemoryOvercommit(Boolean.parseBoolean(wg.getProperties().getOrDefault(WorkloadGroup.ENABLE_MEMORY_OVERCOMMIT, "")));
354353
summary.setCpuHardLimit(Integer.parseInt(wg.getProperties().getOrDefault(WorkloadGroup.CPU_HARD_LIMIT, "")));
355354
summary.setMaxConcurrency(Integer.parseInt(wg.getProperties().getOrDefault(WorkloadGroup.MAX_CONCURRENCY, "")));
356355
summary.setMaxQueueSize(Integer.parseInt(wg.getProperties().getOrDefault(WorkloadGroup.MAX_QUEUE_SIZE, "")));

0 commit comments

Comments
 (0)