You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2022/04/26 15:52:10 UTC
[incubator-doris] 07/15: [fix](hierarchical-storage) Fix bug that storage medium property change back to SSD (#9158)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch dev-1.0.1
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
commit b806876951bc6e3c4b43167c7f1d967120675f59
Author: morningman <mo...@163.com>
AuthorDate: Tue Apr 26 18:20:03 2022 +0800
[fix](hierarchical-storage) Fix bug that storage medium property change back to SSD (#9158)
---
be/src/exec/broker_scanner.cpp | 1 +
fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/be/src/exec/broker_scanner.cpp b/be/src/exec/broker_scanner.cpp
index 00c31d3c1f..83b0794aa3 100644
--- a/be/src/exec/broker_scanner.cpp
+++ b/be/src/exec/broker_scanner.cpp
@@ -459,6 +459,7 @@ Status BrokerScanner::_convert_one_row(const Slice& line, Tuple* tuple, MemPool*
RETURN_IF_ERROR(_line_to_src_tuple(line));
if (!_success) {
// If not success, which means we met an invalid row, return.
+ *fill_tuple = false;
return Status::OK();
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java
index 480f837d18..81ce88c6e4 100755
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java
@@ -4981,7 +4981,8 @@ public class Catalog {
if (dataProperty.getStorageMedium() == TStorageMedium.SSD
&& dataProperty.getCooldownTimeMs() < currentTimeMs) {
// expire. change to HDD.
- partitionInfo.setDataProperty(partition.getId(), new DataProperty(TStorageMedium.HDD));
+ DataProperty hddProperty = new DataProperty(TStorageMedium.HDD);
+ partitionInfo.setDataProperty(partition.getId(), hddProperty);
storageMediumMap.put(partitionId, TStorageMedium.HDD);
LOG.debug("partition[{}-{}-{}] storage medium changed from SSD to HDD",
dbId, tableId, partitionId);
@@ -4990,7 +4991,7 @@ public class Catalog {
ModifyPartitionInfo info =
new ModifyPartitionInfo(db.getId(), olapTable.getId(),
partition.getId(),
- DataProperty.DEFAULT_DATA_PROPERTY,
+ hddProperty,
ReplicaAllocation.NOT_SET,
partitionInfo.getIsInMemory(partition.getId()));
editLog.logModifyPartition(info);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org