pdxx
/
fastdfs
mirror of https://github.com/happyfish100/fastdfs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upgrade version to 6.04

pull/484/head
YuQing 2019-12-05 08:54:39 +08:00
parent 22824e5f07
commit 6bfb8215ff
4 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -1,5 +1,5 @@
Version 6.04 2019-12-04 Version 6.04 2019-12-05
* storage_report_ip_changed ignore result EEXIST * storage_report_ip_changed ignore result EEXIST
* use get_gzip_command_filename from libfastcommon v1.42 * use get_gzip_command_filename from libfastcommon v1.42
* support compress error log and access log * support compress error log and access log

4
INSTALL
View File

@ -11,7 +11,7 @@ Chinese language: http://www.fastken.com/
# command lines as: # command lines as:
git clone https://github.com/happyfish100/libfastcommon.git 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 ./make.sh clean && ./make.sh && ./make.sh install
@ -21,7 +21,7 @@ Chinese language: http://www.fastken.com/
# command lines as: # command lines as:
git clone https://github.com/happyfish100/fastdfs.git 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 ./make.sh clean && ./make.sh && ./make.sh install

6
fastdfs.spec
View File

@ -3,7 +3,7 @@
%define FDFSClient libfdfsclient %define FDFSClient libfdfsclient
%define FDFSClientDevel libfdfsclient-devel %define FDFSClientDevel libfdfsclient-devel
%define FDFSTool fastdfs-tool %define FDFSTool fastdfs-tool
%define FDFSVersion 6.0.3 %define FDFSVersion 6.0.4
%define CommitVersion %(echo $COMMIT_VERSION) %define CommitVersion %(echo $COMMIT_VERSION)
Name: %{FastDFS} 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) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: %__cp %__mv %__chmod %__grep %__mkdir %__install %__id Requires: %__cp %__mv %__chmod %__grep %__mkdir %__install %__id
BuildRequires: libfastcommon-devel >= 1.0.41 BuildRequires: libfastcommon-devel >= 1.0.42
%description %description
This package provides tracker & storage of fastdfs This package provides tracker & storage of fastdfs
commit version: %{CommitVersion} commit version: %{CommitVersion}
%package -n %{FDFSServer} %package -n %{FDFSServer}
Requires: libfastcommon >= 1.0.41 Requires: libfastcommon >= 1.0.42
Summary: fastdfs tracker & storage Summary: fastdfs tracker & storage
%package -n %{FDFSTool} %package -n %{FDFSTool}

17
storage/storage_disk_recovery.c
View File

@ -1091,7 +1091,8 @@ static int do_dispatch_binlog_for_threads(const char *pBasePath)
for (i=0; i<g_disk_recovery_threads; i++) for (i=0; i<g_disk_recovery_threads; i++)
{ {
recovery_get_full_filename_ex(pBasePath, 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, snprintf(dispatchs[i].temp_filename,
sizeof(dispatchs[i].temp_filename), sizeof(dispatchs[i].temp_filename),
"%s.tmp", dispatchs[i].binlog_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, if (rename(dispatchs[i].temp_filename,
dispatchs[i].binlog_filename) != 0) dispatchs[i].binlog_filename) != 0)
{ {
result = errno != 0 ? errno : EPERM;
logError("file: "__FILE__", line: %d, " logError("file: "__FILE__", line: %d, "
"rename file %s to %s fail, " "rename file %s to %s fail, "
"errno: %d, error info: %s", __LINE__, "errno: %d, error info: %s", __LINE__,
dispatchs[i].temp_filename, dispatchs[i].temp_filename,
dispatchs[i].binlog_filename, dispatchs[i].binlog_filename,
errno, STRERROR(errno)); result, STRERROR(result));
return errno != 0 ? errno : EPERM; break;
} }
recovery_get_full_filename_ex(pBasePath, i, 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); stat(dispatchs[i].binlog_filename, &file_stat);
log_buff.len += snprintf(log_buff.str + log_buff.len, log_buff.len += snprintf(log_buff.str + log_buff.len,
sizeof(buff) - log_buff.len, sizeof(buff) - log_buff.len,
", {thread: #%d, lines: %"PRId64 ", {thread: #%d, record_count: %"PRId64
", size: %"PRId64"}", ", file_size: %"PRId64"}",
i, dispatchs[i].count, i, dispatchs[i].count,
(int64_t)file_stat.st_size); (int64_t)file_stat.st_size);
} }
free(dispatchs); free(dispatchs);
if (result == 0)
{
logInfo("file: "__FILE__", line: %d, " logInfo("file: "__FILE__", line: %d, "
"dispatch stats => total lines: %"PRId64"%s", "dispatch stats => record count: %"PRId64"%s",
__LINE__, total_count, log_buff.str); __LINE__, total_count, log_buff.str);
}
return result; return result;
} }