First check existence of generate location in run_generate.

GitOrigin-RevId: e4a9ac3a7cef153bde854a058bcd81a371d58dd7
This commit is contained in:
levlam 2020-05-24 21:35:47 +03:00
parent 77304e3209
commit d5c6c51f15

View File

@ -2522,6 +2522,10 @@ void FileManager::run_generate(FileNodePtr node) {
return;
}
FileView file_view(node);
if (!file_view.can_generate()) {
LOG(INFO) << "Skip run_generate, because file " << node->main_file_id_ << " can't be generated";
return;
}
if (file_view.has_local_location()) {
LOG(INFO) << "Skip run_generate, because file " << node->main_file_id_ << " has local location";
return;
@ -2530,10 +2534,6 @@ void FileManager::run_generate(FileNodePtr node) {
LOG(INFO) << "Skip run_generate, because file " << node->main_file_id_ << " can be downloaded from server";
return;
}
if (!file_view.can_generate()) {
LOG(INFO) << "Skip run_generate, because file " << node->main_file_id_ << " can't be generated";
return;
}
int8 download_priority = 0;
int8 upload_priority = 0;
@ -2639,7 +2639,7 @@ void FileManager::run_upload(FileNodePtr node, std::vector<int> bad_parts) {
return;
}
if (file_view.has_generate_location() && file_view.generate_location().file_type_ == FileType::Secure) {
// Can't upload secure file before its size is known.
// Can't upload secure file before its size is known
LOG(INFO) << "Can't upload secure file " << node->main_file_id_ << " before it's size is known";
return;
}