This is an automated email from the ASF dual-hosted git repository. morningman pushed a commit to branch branch-1.2-lts in repository https://gitbox.apache.org/repos/asf/doris.git
commit d9fe522cca8ddb19a5a65ee04be1217a44597853 Author: Mingyu Chen <[email protected]> AuthorDate: Fri May 12 11:02:55 2023 +0800 [minor](log) change debug log to info to observe the storage medium change #19529 When user set default_storage_medium to true, the storage medium of all partitions should be SSD, and cooldown time should be 9999-12-31 23:59:59. So that it won't change to HDD. But looks like sometimes it still change to HDD. So I change the debug log to info to observer it. --- .../main/java/org/apache/doris/catalog/DataProperty.java | 13 +++++++++++-- fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java | 6 ++++-- .../main/java/org/apache/doris/catalog/PartitionInfo.java | 4 ++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/DataProperty.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/DataProperty.java index 8c24926dd8..b9bc6354c2 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/DataProperty.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/DataProperty.java @@ -35,10 +35,12 @@ import java.io.IOException; import java.util.Objects; public class DataProperty implements Writable, GsonPostProcessable { - public static final TStorageMedium DEFAULT_STORAGE_MEDIUM = - "SSD".equalsIgnoreCase(Config.default_storage_medium) ? TStorageMedium.SSD : TStorageMedium.HDD; + public static final TStorageMedium DEFAULT_STORAGE_MEDIUM = "SSD".equalsIgnoreCase(Config.default_storage_medium) + ? TStorageMedium.SSD : TStorageMedium.HDD; public static final long MAX_COOLDOWN_TIME_MS = 253402271999000L; // 9999-12-31 23:59:59 + public static final DataProperty DEFAULT_HDD_DATA_PROPERTY = new DataProperty(TStorageMedium.HDD); + @SerializedName(value = "storageMedium") private TStorageMedium storageMedium; @SerializedName(value = "cooldownTimeMs") @@ -56,6 +58,13 @@ public class DataProperty implements Writable, GsonPostProcessable { this.storagePolicy = ""; } + public DataProperty(DataProperty other) { + this.storageMedium = other.storageMedium; + this.cooldownTimeMs = other.cooldownTimeMs; + this.storagePolicy = other.storagePolicy; + this.isMutable = other.isMutable; + } + /** * DataProperty construction. * diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java index 970d86584d..306a52e39f 100755 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java @@ -3442,8 +3442,10 @@ public class Env { 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); + LOG.info("partition[{}-{}-{}] storage medium changed from SSD to HDD. " + + "cooldown time: {}. current time: {}", dbId, tableId, partitionId, + TimeUtils.longToTimeString(dataProperty.getCooldownTimeMs()), + TimeUtils.longToTimeString(currentTimeMs)); // log ModifyPartitionInfo info = new ModifyPartitionInfo(db.getId(), olapTable.getId(), diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/PartitionInfo.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/PartitionInfo.java index a18c5308c1..35ada94add 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/PartitionInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/PartitionInfo.java @@ -319,7 +319,7 @@ public class PartitionInfo implements Writable { out.writeInt(idToDataProperty.size()); for (Map.Entry<Long, DataProperty> entry : idToDataProperty.entrySet()) { out.writeLong(entry.getKey()); - if (entry.getValue().equals(new DataProperty(TStorageMedium.HDD))) { + if (entry.getValue().equals(DataProperty.DEFAULT_HDD_DATA_PROPERTY)) { out.writeBoolean(true); } else { out.writeBoolean(false); @@ -339,7 +339,7 @@ public class PartitionInfo implements Writable { long partitionId = in.readLong(); boolean isDefaultHddDataProperty = in.readBoolean(); if (isDefaultHddDataProperty) { - idToDataProperty.put(partitionId, new DataProperty(TStorageMedium.HDD)); + idToDataProperty.put(partitionId, new DataProperty(DataProperty.DEFAULT_HDD_DATA_PROPERTY)); } else { idToDataProperty.put(partitionId, DataProperty.read(in)); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
