Skip to content

[branch-2.1] pick some pr from master #44556

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
wangbo merged 4 commits into from
Nov 25, 2024
Merged

[branch-2.1] pick some pr from master #44556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e9c197
[Improvement]Add more tip when drop workload group failed (#40468)
wangbo Sep 9, 2024
1e7b2e6
[Fix]only publish topic to alive be (#40535)
wangbo Sep 10, 2024
52ff294
[Fix]Fix publish may wait timeout because of dead BE (#40763)
wangbo Sep 23, 2024
adcdb0a
[Fix]Fix thread num not reset 0 when fetch failed (#40855)
wangbo Sep 18, 2024
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: 1 addition & 1 deletion be/src/util/doris_metrics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ void DorisMetrics::_update_process_thread_num() {
std::filesystem::directory_iterator dict_iter("/proc/self/task/", ec);
if (ec) {
LOG(WARNING) << "failed to count thread num: " << ec.message();
process_fd_num_used->set_value(0);
process_thread_num->set_value(0);
return;
}
int64_t count =
Expand Down
18 changes: 16 additions & 2 deletions fe/fe-core/src/main/java/org/apache/doris/common/publish/TopicPublisherThread.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -76,13 +75,28 @@ protected void runAfterCatalogReady() {
// because it may means workload group/policy is dropped

// step 2: publish topic info to all be
Collection<Backend> nodesToPublish = clusterInfoService.getIdToBackend().values();
List<Backend> nodesToPublish = new ArrayList<>();
try {
for (Backend be : clusterInfoService.getIdToBackend().values()) {
if (be.isAlive()) {
nodesToPublish.add(be);
}
}
} catch (Exception e) {
LOG.warn("get backends failed", e);
return;
}
if (nodesToPublish.isEmpty()) {
LOG.info("no alive backend, skip publish topic");
return;
}
AckResponseHandler handler = new AckResponseHandler(nodesToPublish);
for (Backend be : nodesToPublish) {
executor.submit(new TopicPublishWorker(request, be, handler));
}
try {
int timeoutMs = Config.publish_topic_info_interval_ms / 3 * 2;
timeoutMs = timeoutMs <= 0 ? 3000 : timeoutMs;
if (!handler.awaitAllInMs(timeoutMs)) {
Backend[] backends = handler.pendingNodes();
if (backends.length > 0) {
Expand Down
5 changes: 4 additions & 1 deletion fe/fe-core/src/main/java/org/apache/doris/resource/workloadgroup/WorkloadGroupMgr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,10 @@ public void dropWorkloadGroup(DropWorkloadGroupStmt stmt) throws DdlException {
// user need to reset user property first
Pair<Boolean, String> ret = Env.getCurrentEnv().getAuth().isWorkloadGroupInUse(workloadGroupName);
if (ret.first) {
throw new DdlException("workload group " + workloadGroupName + " is set for user " + ret.second);
throw new DdlException("workload group " + workloadGroupName + " is set for user " + ret.second
+ ", you can reset the user's property(eg, "
+ "set property for " + ret.second + " 'default_workload_group'='xxx'; ), "
+ "then you can drop the group.");
}

// A group with related policies should not be deleted.
Expand Down