imay closed pull request #447: Revert commit 'Add log to detect empty load file'
URL: https://github.com/apache/incubator-doris/pull/447
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/be/src/agent/pusher.cpp b/be/src/agent/pusher.cpp
index eab1f1b5..cbf2f70e 100644
--- a/be/src/agent/pusher.cpp
+++ b/be/src/agent/pusher.cpp
@@ -117,7 +117,6 @@ void Pusher::_get_file_name_from_path(const string&
file_path, string* file_name
AgentStatus Pusher::process(vector<TTabletInfo>* tablet_infos) {
AgentStatus status = DORIS_SUCCESS;
-
// Remote file not empty, need to download
if (_push_req.__isset.http_file_path) {
// Get file length and timeout
diff --git a/be/src/agent/task_worker_pool.cpp
b/be/src/agent/task_worker_pool.cpp
index 751f1a3b..6d933378 100644
--- a/be/src/agent/task_worker_pool.cpp
+++ b/be/src/agent/task_worker_pool.cpp
@@ -750,45 +750,36 @@ void* TaskWorkerPool::_push_worker_thread_callback(void*
arg_this) {
LOG(INFO) << "get push task. signature: " << agent_task_req.signature
<< " user: " << user << " priority: " << priority;
-
vector<TTabletInfo> tablet_infos;
if (push_req.push_type == TPushType::LOAD || push_req.push_type ==
TPushType::LOAD_DELETE) {
- if (!push_req.__isset.http_file_path) {
- LOG(WARNING) << "push request does not set load file for
tablet: "
- << agent_task_req.signature;
- status = DORIS_FILE_DOWNLOAD_NOT_EXIST;
- }
-
- if (status == DORIS_SUCCESS) {
#ifndef BE_TEST
- Pusher pusher(worker_pool_this->_env->olap_engine(), push_req);
- status = pusher.init();
+ Pusher pusher(worker_pool_this->_env->olap_engine(), push_req);
+ status = pusher.init();
#else
- status = worker_pool_this->_pusher->init();
+ status = worker_pool_this->_pusher->init();
#endif
- if (status == DORIS_SUCCESS) {
- uint32_t retry_time = 0;
- while (retry_time < PUSH_MAX_RETRY) {
+ if (status == DORIS_SUCCESS) {
+ uint32_t retry_time = 0;
+ while (retry_time < PUSH_MAX_RETRY) {
#ifndef BE_TEST
- status = pusher.process(&tablet_infos);
+ status = pusher.process(&tablet_infos);
#else
- status =
worker_pool_this->_pusher->process(&tablet_infos);
+ status = worker_pool_this->_pusher->process(&tablet_infos);
#endif
- if (status == DORIS_PUSH_HAD_LOADED) {
- OLAP_LOG_WARNING("transaction exists when realtime
push, "
- "but unfinished, do not report to fe,
signature: %ld",
- agent_task_req.signature);
- break; // not retry any more
- }
- // Internal error, need retry
- if (status == DORIS_ERROR) {
- OLAP_LOG_WARNING("push internal error, need
retry.signature: %ld",
- agent_task_req.signature);
- retry_time += 1;
- } else {
- break;
- }
+ if (status == DORIS_PUSH_HAD_LOADED) {
+ OLAP_LOG_WARNING("transaction exists when realtime
push, "
+ "but unfinished, do not report to fe,
signature: %ld",
+ agent_task_req.signature);
+ break; // not retry any more
+ }
+ // Internal error, need retry
+ if (status == DORIS_ERROR) {
+ OLAP_LOG_WARNING("push internal error, need
retry.signature: %ld",
+ agent_task_req.signature);
+ retry_time += 1;
+ } else {
+ break;
}
}
}
diff --git a/fe/src/main/java/org/apache/doris/load/LoadChecker.java
b/fe/src/main/java/org/apache/doris/load/LoadChecker.java
index 97d5b8c1..91a8ba34 100644
--- a/fe/src/main/java/org/apache/doris/load/LoadChecker.java
+++ b/fe/src/main/java/org/apache/doris/load/LoadChecker.java
@@ -448,11 +448,6 @@ private void tryCommitJob(LoadJob job, Database db) {
type = TPushType.LOAD_DELETE;
}
- if (type == TPushType.LOAD && (filePath == null ||
fileSize < 0)) {
- LOG.warn("get empty load file for tablet {}",
tabletId);
- continue;
- }
-
// add task to batchTask
Set<Long> allReplicas = new HashSet<Long>();
Set<Long> finishedReplicas = new HashSet<Long>();
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@doris.apache.org
For additional commands, e-mail: dev-h...@doris.apache.org
