add output result

Author: kitmanzheng

conf/config.ini

@@ -49,6 +49,8 @@ daemonModeInterVal=60
 # 但每一个任务都是 先判断时间是否在迁移窗口，然后开始迁移，有可能判断的时候 在时间窗口，但是迁移过程中有可能跨过时间窗口, 即存在少量的迁移在时间窗口外执行。
 executeTimeWindow=00:00,24:00
 
+# 迁移成功的结果，按日期归档此目录，为空即不输出。格式每一行为：绝对路径\t文件大小\t最后修改时间，该目录需要存在。
+outputFinishedFileFolder=./result
 
 # 从本地迁移到COS配置分节
 [migrateLocal]

dep/cos_migrate_tool-1.0-jar-with-dependencies.jar

@@ -35,6 +35,7 @@ public class CommonConfig {
     private String encryptionType = "";
     private String batchTaskPath = "";    
     private boolean realTimeCompare = false;
+    private String outputFinishedFilePath = "";
 
     public void setRealTimeCompare(String realTimeCompare)  throws IllegalArgumentException {
         if (realTimeCompare.equalsIgnoreCase("on")) {
@@ -364,4 +365,24 @@ public String getProxyHost() {
     public int getProxyPort() {
         return this.cosProxyPort;
     }
+    
+    
+    public void setOutputFinishedFilePath(String path) throws IllegalArgumentException {
+        path = path.trim();
+        File tempFolder = new File(path);
+        if (!tempFolder.exists()) {
+            throw new IllegalArgumentException("tempFolderPath " + path + " not exist!");
+        }
+
+        if (path.endsWith("/") || path.endsWith("\\")) {
+            this.outputFinishedFilePath = path;
+        } else {
+            this.outputFinishedFilePath = path + "/";
+        }
+        this.outputFinishedFilePath = SystemUtils.formatLocalPath(this.outputFinishedFilePath);
+    }
+    
+    public String getOutputFinishedFilePath() {
+        return this.outputFinishedFilePath;
+    }
 }

src/main/java/com/qcloud/cos_migrate_tool/config/CommonConfig.java

@@ -51,6 +51,7 @@ public class ConfigParser {
     private static final String COMMON_THREAD_NUM = "threadNum";
     private static final String COMMON_BATCH_TASK_PATH = "batchTaskPath";
     private static final String COMMON_REAL_TIME_COMPARE = "realTimeCompare";
+    private static final String COMMON_OUTPUT_FINISHED_FILE = "outputFinishedFileFolder";
 
     private static final String LOCAL_SECTION_NAME = "migrateLocal";
     private static final String LOCAL_LOCALPATH = "localPath";
@@ -537,6 +538,12 @@ private boolean initCommonConfig(Preferences prefs, CommonConfig commonConfig) {
             if (taskExecutorNumberStr != null && !taskExecutorNumberStr.isEmpty()) {
                 commonConfig.setTaskExecutorNumberStr(taskExecutorNumberStr);
             }
+            
+            
+            String finishedFileFolder = getConfigValue(prefs, COMMON_SECTION_NAME, COMMON_OUTPUT_FINISHED_FILE);
+            if (finishedFileFolder!=null && !finishedFileFolder.isEmpty()) {
+                commonConfig.setOutputFinishedFilePath(finishedFileFolder);
+            }
 
 
         } catch (Exception e) {

src/main/java/com/qcloud/cos_migrate_tool/config/ConfigParser.java

@@ -1,14 +1,22 @@
 package com.qcloud.cos_migrate_tool.task;
 
+import java.io.BufferedOutputStream;
 import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.concurrent.Semaphore;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.qcloud.cos.model.StorageClass;
 import com.qcloud.cos.transfer.TransferManager;
+import com.qcloud.cos_migrate_tool.config.ConfigParser;
 import com.qcloud.cos_migrate_tool.config.CopyFromLocalConfig;
+import com.qcloud.cos_migrate_tool.config.MigrateType;
 import com.qcloud.cos_migrate_tool.meta.TaskStatics;
 import com.qcloud.cos_migrate_tool.record.MigrateLocalRecordElement;
 import com.qcloud.cos_migrate_tool.record.RecordDb;
@@ -82,6 +90,27 @@ public void doTask() {
             } else {
                 TaskStatics.instance.addUpdateCnt();
             }
+            
+            if(!config.getOutputFinishedFilePath().isEmpty()) {
+                //TODO
+                SimpleDateFormat dateFormat= new SimpleDateFormat("YYYY-MM-dd");//设置当前时间的格式，为年-月-日 
+                String file_name = dateFormat.format(new Date()) + ".out";
+                String resultFile = config.getOutputFinishedFilePath() + file_name;
+                try {
+                    BufferedOutputStream bos =
+                            new BufferedOutputStream(new FileOutputStream(resultFile, true));
+                    String recordMsg =
+                            String.format("%s\t%d\t%d\n", localFile.getAbsolutePath(), localFile.length(), localFile.lastModified());
+                    bos.write(recordMsg.getBytes());
+                    bos.close();
+                } catch (FileNotFoundException e) {
+                    log.error("write result fail,result \n" + e.toString());
+                } catch (IOException e) {
+                    log.error("write result fail,result \n"  + e.toString());
+                }
+            }
+            
+            
             String printMsg =
                     String.format("[ok] [requestid: %s], task_info: %s", requestId == null ? "NULL" : requestId, migrateLocalRecordElement.buildKey());
             System.out.println(printMsg);

src/main/java/com/qcloud/cos_migrate_tool/task/MigrateLocalTask.java

@@ -1,6 +1,12 @@
 package com.qcloud.cos_migrate_tool.task;
 
+import java.io.BufferedOutputStream;
 import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.ThreadLocalRandom;
 
@@ -237,11 +243,14 @@ public String uploadFile(String bucketName, String cosPath, File localFile,
 
         while (retryTime < maxRetry) {
             try {
+                String requestId;
                 if (localFile.length() >= smallFileThreshold) {
-                    return uploadBigFile(putObjectRequest);
+                    requestId = uploadBigFile(putObjectRequest);
                 } else {
-                    return uploadSmallFile(putObjectRequest);
+                    requestId = uploadSmallFile(putObjectRequest);
                 }
+                
+                return requestId;
             } catch (Exception e) {
                 log.warn("upload failed, ready to retry. retryTime:" + retryTime, e);
                 ++retryTime;