diff --git a/HISTORY b/HISTORY
index 6cd7a18..b1e6d12 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,5 +1,5 @@
 
-Version 6.04  2019-12-04
+Version 6.04  2019-12-05
  * storage_report_ip_changed ignore result EEXIST
  * use get_gzip_command_filename from libfastcommon v1.42
  * support compress error log and access log
diff --git a/INSTALL b/INSTALL
index 9ef8eb9..840735c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -11,7 +11,7 @@ Chinese language: http://www.fastken.com/
 # command lines as:
 
    git clone https://github.com/happyfish100/libfastcommon.git
-   cd libfastcommon; git checkout V1.0.41
+   cd libfastcommon; git checkout V1.0.42
    ./make.sh clean && ./make.sh && ./make.sh install
 
 
@@ -21,7 +21,7 @@ Chinese language: http://www.fastken.com/
 # command lines as:
 
    git clone https://github.com/happyfish100/fastdfs.git
-   cd fastdfs; git checkout V6.03
+   cd fastdfs; git checkout V6.04
    ./make.sh clean && ./make.sh && ./make.sh install
 
 
diff --git a/fastdfs.spec b/fastdfs.spec
index 86f8259..1943e16 100644
--- a/fastdfs.spec
+++ b/fastdfs.spec
@@ -3,7 +3,7 @@
 %define FDFSClient libfdfsclient
 %define FDFSClientDevel libfdfsclient-devel
 %define FDFSTool   fastdfs-tool
-%define FDFSVersion 6.0.3
+%define FDFSVersion 6.0.4
 %define CommitVersion %(echo $COMMIT_VERSION)
 
 Name: %{FastDFS}
@@ -18,14 +18,14 @@ Source: http://perso.orange.fr/sebastien.godard/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Requires: %__cp %__mv %__chmod %__grep %__mkdir %__install %__id
-BuildRequires: libfastcommon-devel >= 1.0.41
+BuildRequires: libfastcommon-devel >= 1.0.42
 
 %description
 This package provides tracker & storage of fastdfs
 commit version: %{CommitVersion}
 
 %package -n %{FDFSServer}
-Requires: libfastcommon >= 1.0.41
+Requires: libfastcommon >= 1.0.42
 Summary: fastdfs tracker & storage
 
 %package -n %{FDFSTool}
diff --git a/storage/storage_disk_recovery.c b/storage/storage_disk_recovery.c
index 9163f5d..0e3dbb0 100644
--- a/storage/storage_disk_recovery.c
+++ b/storage/storage_disk_recovery.c
@@ -1091,7 +1091,8 @@ static int do_dispatch_binlog_for_threads(const char *pBasePath)
     for (i=0; i<g_disk_recovery_threads; i++)
     {
         recovery_get_full_filename_ex(pBasePath, i,
-                RECOVERY_BINLOG_FILENAME, dispatchs[i].binlog_filename);
+                RECOVERY_BINLOG_FILENAME,
+                dispatchs[i].binlog_filename);
         snprintf(dispatchs[i].temp_filename,
                 sizeof(dispatchs[i].temp_filename),
                 "%s.tmp", dispatchs[i].binlog_filename);
@@ -1166,13 +1167,14 @@ static int do_dispatch_binlog_for_threads(const char *pBasePath)
         if (rename(dispatchs[i].temp_filename,
                     dispatchs[i].binlog_filename) != 0)
         {
+            result = errno != 0 ? errno : EPERM;
             logError("file: "__FILE__", line: %d, "
                     "rename file %s to %s fail, "
                     "errno: %d, error info: %s", __LINE__,
                     dispatchs[i].temp_filename,
                     dispatchs[i].binlog_filename,
-                    errno, STRERROR(errno));
-            return errno != 0 ? errno : EPERM;
+                    result, STRERROR(result));
+            break;
         }
 
         recovery_get_full_filename_ex(pBasePath, i,
@@ -1186,16 +1188,19 @@ static int do_dispatch_binlog_for_threads(const char *pBasePath)
         stat(dispatchs[i].binlog_filename, &file_stat);
         log_buff.len += snprintf(log_buff.str + log_buff.len,
                 sizeof(buff) - log_buff.len,
-                ", {thread: #%d, lines: %"PRId64
-                ", size: %"PRId64"}",
+                ", {thread: #%d, record_count: %"PRId64
+                ", file_size: %"PRId64"}",
                 i, dispatchs[i].count,
                 (int64_t)file_stat.st_size);
     }
     free(dispatchs);
 
-    logInfo("file: "__FILE__", line: %d, "
-            "dispatch stats => total lines: %"PRId64"%s",
-            __LINE__, total_count, log_buff.str);
+    if (result == 0)
+    {
+        logInfo("file: "__FILE__", line: %d, "
+                "dispatch stats => record count: %"PRId64"%s",
+                __LINE__, total_count, log_buff.str);
+    }
     return result;
 }