[doris] branch master updated: fix empty storage policy, be refresh exception log. (#11123)

[yiguolei]

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 98abb8bc1f fix empty storage policy, be refresh exception log. (#11123)
98abb8bc1f is described below

commit 98abb8bc1f46e462cb51d5a34b8f0c89d525fffb
Author: deardeng <565620...@qq.com>
AuthorDate: Fri Jul 22 22:10:16 2022 +0800

    fix empty storage policy, be refresh exception log. (#11123)
    
    * fix empty storage policy, be refresh exception log.
    
    * fix log level
---
 be/src/agent/task_worker_pool.cpp                                  | 2 +-
 be/src/agent/utils.cpp                                             | 2 +-
 .../src/main/java/org/apache/doris/policy/StoragePolicy.java       | 4 ++--
 .../main/java/org/apache/doris/service/FrontendServiceImpl.java    | 7 +++++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/be/src/agent/task_worker_pool.cpp 
b/be/src/agent/task_worker_pool.cpp
index 76a1d72eba..dafa6be519 100644
--- a/be/src/agent/task_worker_pool.cpp
+++ b/be/src/agent/task_worker_pool.cpp
@@ -365,7 +365,7 @@ void 
TaskWorkerPool::_create_tablet_worker_thread_callback() {
         TStatus task_status;
 
         std::vector<TTabletInfo> finish_tablet_infos;
-        LOG(INFO) << "create tablet: " << create_tablet_req;
+        VLOG_NOTICE << "create tablet: " << create_tablet_req;
         Status create_status = 
_env->storage_engine()->create_tablet(create_tablet_req);
         if (!create_status.ok()) {
             LOG(WARNING) << "create table failed. status: " << create_status
diff --git a/be/src/agent/utils.cpp b/be/src/agent/utils.cpp
index aaa9505933..1916c31041 100644
--- a/be/src/agent/utils.cpp
+++ b/be/src/agent/utils.cpp
@@ -164,7 +164,7 @@ Status 
MasterServerClient::refresh_storage_policy(TGetStoragePolicyResult* resul
         LOG(WARNING) << "fail to report to master. "
                      << "host=" << _master_info.network_address.hostname
                      << ", port=" << _master_info.network_address.port
-                     << ", code=" << client_status.code();
+                     << ", code=" << client_status.code() << ", e.what: " << 
e.what();
         return Status::InternalError("Fail to refresh storage policy from 
master");
     }
 
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/policy/StoragePolicy.java 
b/fe/fe-core/src/main/java/org/apache/doris/policy/StoragePolicy.java
index b45ccba7e4..523e20aeb0 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/policy/StoragePolicy.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/policy/StoragePolicy.java
@@ -399,9 +399,9 @@ public class StoragePolicy extends Policy {
                 tmpMap.put(COOLDOWN_TTL, this.getCooldownTtl());
             });
             tmpMap.put(MD5_CHECKSUM, this.getMd5Checksum());
-            NotifyUpdateStoragePolicyTask createReplicaTask
+            NotifyUpdateStoragePolicyTask notifyUpdateStoragePolicyTask
                     = new NotifyUpdateStoragePolicyTask(beId, getPolicyName(), 
tmpMap);
-            batchTask.addTask(createReplicaTask);
+            batchTask.addTask(notifyUpdateStoragePolicyTask);
             LOG.info("update policy info to be: {}, policy name: {}, "
                         + "properties: {} to modify S3 resource batch task.",
                     beId, getPolicyName(), tmpMap);
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java 
b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
index 80eddd7e64..9a24ddc3d5 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
@@ -122,6 +122,7 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.thrift.TException;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -1000,7 +1001,6 @@ public class FrontendServiceImpl implements 
FrontendService.Iface {
 
     @Override
     public TGetStoragePolicyResult refreshStoragePolicy() throws TException {
-        LOG.debug("refresh storage policy request");
         TGetStoragePolicyResult result = new TGetStoragePolicyResult();
         TStatus status = new TStatus(TStatusCode.OK);
         result.setStatus(status);
@@ -1049,8 +1049,11 @@ public class FrontendServiceImpl implements 
FrontendService.Iface {
                     result.addToResultEntrys(rEntry);
                 }
         );
+        if (policyList.size() == 0) {
+            result.setResultEntrys(new ArrayList<>());
+        }
 
-        LOG.info("refresh storage policy request: {}", result);
+        LOG.debug("refresh storage policy request: {}", result);
         return result;
     }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org