You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by yi...@apache.org on 2023/01/19 00:03:38 UTC
[doris] branch master updated: [bug](cooldown)fix bug for single cooldown (#16040)
This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new c43edbdfea [bug](cooldown)fix bug for single cooldown (#16040)
c43edbdfea is described below
commit c43edbdfeafd2b1a5b205c66f6dd71b55d705b40
Author: pengxiangyu <di...@163.com>
AuthorDate: Thu Jan 19 08:03:32 2023 +0800
[bug](cooldown)fix bug for single cooldown (#16040)
* fix bug for single cooldown
* fix bug for single cooldown
---
be/src/agent/task_worker_pool.cpp | 3 +++
.../main/java/org/apache/doris/cooldown/CooldownHandler.java | 11 +++++++----
.../src/main/java/org/apache/doris/cooldown/CooldownJob.java | 8 ++++++--
3 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/be/src/agent/task_worker_pool.cpp b/be/src/agent/task_worker_pool.cpp
index 29bfd3631b..ae5248c943 100644
--- a/be/src/agent/task_worker_pool.cpp
+++ b/be/src/agent/task_worker_pool.cpp
@@ -1706,6 +1706,9 @@ void TaskWorkerPool::_push_cooldown_conf_worker_thread_callback() {
while (_is_work && _tasks.empty()) {
_worker_thread_condition_variable.wait(worker_thread_lock);
}
+ if (!_is_work) {
+ return;
+ }
agent_task_req = _tasks.front();
push_cooldown_conf_req = agent_task_req.push_cooldown_conf;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/cooldown/CooldownHandler.java b/fe/fe-core/src/main/java/org/apache/doris/cooldown/CooldownHandler.java
index e8c5ba6c9a..867ad8aee7 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/cooldown/CooldownHandler.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/cooldown/CooldownHandler.java
@@ -22,6 +22,7 @@ import org.apache.doris.catalog.Replica;
import org.apache.doris.catalog.TabletMeta;
import org.apache.doris.common.Config;
import org.apache.doris.common.FeConstants;
+import org.apache.doris.common.FeMetaVersion;
import org.apache.doris.common.ThreadPoolManager;
import org.apache.doris.common.util.MasterDaemon;
@@ -142,10 +143,12 @@ public class CooldownHandler extends MasterDaemon {
}
public void readField(DataInput in) throws IOException {
- int size = in.readInt();
- for (int i = 0; i < size; i++) {
- CooldownJob cooldownJob = CooldownJob.read(in);
- replayCooldownJob(cooldownJob);
+ if (Env.getCurrentEnvJournalVersion() >= FeMetaVersion.VERSION_115) {
+ int size = in.readInt();
+ for (int i = 0; i < size; i++) {
+ CooldownJob cooldownJob = CooldownJob.read(in);
+ replayCooldownJob(cooldownJob);
+ }
}
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/cooldown/CooldownJob.java b/fe/fe-core/src/main/java/org/apache/doris/cooldown/CooldownJob.java
index 4c7eb168b6..9a77b77724 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/cooldown/CooldownJob.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/cooldown/CooldownJob.java
@@ -26,6 +26,7 @@ import org.apache.doris.catalog.Replica;
import org.apache.doris.catalog.TableIf;
import org.apache.doris.catalog.Tablet;
import org.apache.doris.common.FeConstants;
+import org.apache.doris.common.FeMetaVersion;
import org.apache.doris.common.MetaNotFoundException;
import org.apache.doris.common.io.Text;
import org.apache.doris.common.io.Writable;
@@ -291,8 +292,11 @@ public class CooldownJob implements Writable {
}
public static CooldownJob read(DataInput in) throws IOException {
- String json = Text.readString(in);
- return GsonUtils.GSON.fromJson(json, CooldownJob.class);
+ if (Env.getCurrentEnvJournalVersion() >= FeMetaVersion.VERSION_115) {
+ String json = Text.readString(in);
+ return GsonUtils.GSON.fromJson(json, CooldownJob.class);
+ }
+ return null;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org