Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions be/src/agent/cgroups_mgr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -347,8 +347,8 @@ AgentStatus CgroupsMgr::init_cgroups() {
_is_cgroups_init_success = true;
return AgentStatus::DORIS_SUCCESS;
} else {
LOG(ERROR) << "Could not find a valid cgroups path for resource isolation,"
<< "current value is " << _root_cgroups_path;
LOG(WARNING) << "Could not find a valid cgroups path for resource isolation,"
<< "current value is " << _root_cgroups_path << ". ignore it.";
_is_cgroups_init_success = false;
return AgentStatus::DORIS_ERROR;
}
Expand Down
2 changes: 1 addition & 1 deletion be/src/agent/task_worker_pool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1086,7 +1086,6 @@ void TaskWorkerPool::_report_tablet_worker_thread_callback() {
TReportRequest request;
request.__set_backend(_backend);
request.__isset.tablets = true;
request.__set_report_version(_s_report_version);

while (_is_work) {
if (_master_info.network_address.port == 0) {
Expand Down Expand Up @@ -1116,6 +1115,7 @@ void TaskWorkerPool::_report_tablet_worker_thread_callback() {
std::max(DorisMetrics::instance()->tablet_cumulative_max_compaction_score->value(),
DorisMetrics::instance()->tablet_base_max_compaction_score->value());
request.__set_tablet_max_compaction_score(max_compaction_score);
request.__set_report_version(_s_report_version);

TMasterResult result;
AgentStatus status = _master_client->report(request, &result);
Expand Down
2 changes: 2 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/load/Load.java
Original file line number Diff line number Diff line change
Expand Up @@ -2020,6 +2020,8 @@ public LinkedList<List<Comparable>> getLoadJobInfosByDb(long dbId, String dbName
jobInfo.add(TimeUtils.longToTimeString(loadJob.getLoadFinishTimeMs()));
// tracking url
jobInfo.add(status.getTrackingUrl());
// job details
jobInfo.add("");

loadJobInfos.add(jobInfo);
} // end for loadJobs
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export TP_JAR_DIR=$TP_INSTALL_DIR/lib/jar
# libevent
# the last release version of libevent is 2.1.8, which was released on 26 Jan 2017, that is too old.
# so we use the master version of libevent, which is downloaded on 22 Jun 2018, with commit 24236aed01798303745470e6c498bf606e88724a
LIBEVENT_DOWNLOAD="https://doris-incubating-repo.bj.bcebos.com/thirdparty/libevent-20180622-24236aed01798303745470e6c498bf606e88724a.zip"
LIBEVENT_DOWNLOAD="https://doris-thirdparty-repo.bj.bcebos.com/thirdparty/libevent-20180622-24236aed01798303745470e6c498bf606e88724a.zip"
LIBEVENT_NAME=libevent-20180622-24236aed01798303745470e6c498bf606e88724a.zip
LIBEVENT_SOURCE=libevent-master
LIBEVENT_MD5SUM="e8b9ba50270ba3b520aec8ff1089f9d7"
Expand Down