natas_hw
/
dolphinscheduler
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix file upload exception. (#7152)

This commit is contained in:
Kerwin 2021-12-03 16:50:05 +08:00 committed by GitHub
parent b2143c31e6
commit ec0c1b53a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
View File

@ -575,7 +575,7 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
if (!HadoopUtils.getInstance().exists(resourcePath)) { if (!HadoopUtils.getInstance().exists(resourcePath)) {
createTenantDirIfNotExists(tenantCode); createTenantDirIfNotExists(tenantCode);
} }
org.apache.dolphinscheduler.api.utils.FileUtils.copyFile(file, localFilename); org.apache.dolphinscheduler.api.utils.FileUtils.copyInputStreamToFile(file, localFilename);
HadoopUtils.getInstance().copyLocalToHdfs(localFilename, hdfsFilename, true, true); HadoopUtils.getInstance().copyLocalToHdfs(localFilename, hdfsFilename, true, true);
} catch (Exception e) { } catch (Exception e) {
FileUtils.deleteFile(localFilename); FileUtils.deleteFile(localFilename);

11
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/FileUtils.java
View File

@ -37,14 +37,13 @@ public class FileUtils {
private static final Logger logger = LoggerFactory.getLogger(FileUtils.class); private static final Logger logger = LoggerFactory.getLogger(FileUtils.class);
/** /**
* copy source file to target file * copy source InputStream to target file
* * @param file
* @param file file * @param destFilename
* @param destFilename destination file name
*/ */
public static void copyFile(MultipartFile file, String destFilename) { public static void copyInputStreamToFile(MultipartFile file, String destFilename) {
try { try {
org.apache.commons.io.FileUtils.copyFile(file.getResource().getFile(), new File(destFilename)); org.apache.commons.io.FileUtils.copyInputStreamToFile(file.getInputStream(), new File(destFilename));
} catch (IOException e) { } catch (IOException e) {
logger.error("failed to copy file , {} is empty file", file.getOriginalFilename(), e); logger.error("failed to copy file , {} is empty file", file.getOriginalFilename(), e);
} }

2
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/utils/FileUtilsTest.java
View File

@ -76,7 +76,7 @@ public class FileUtilsTest {
Mockito.when(file.getResource().getFile()).thenReturn(new File(src)); Mockito.when(file.getResource().getFile()).thenReturn(new File(src));
//Invoke copyFile //Invoke copyFile
FileUtils.copyFile(file,destFilename); FileUtils.copyInputStreamToFile(file,destFilename);
//Test file exists //Test file exists
File destFile = new File(destFilename); File destFile = new File(destFilename);