upgrade version to 3.7.1

happyfish100 · Jan 14, 2023 · 3ee0874 · 3ee0874
1 parent 64d4455
commit 3ee0874
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 53 deletions.
diff --git a/FastCFS-auth.spec.in b/FastCFS-auth.spec.in
@@ -4,7 +4,7 @@
 %define CommitVersion %(echo $COMMIT_VERSION)
 
 Name: FastCFS-auth
-Version: 3.7.0
+Version: 3.7.1
 Release: 1%{?dist}
 Summary: the auth client library and config files of FastCFS. FastCFS is a high performance cloud native distributed file system for databases, KVM and K8s
 License: AGPL v3.0
@@ -14,11 +14,9 @@ Source: http://github.com/happyfish100/FastCFS/%{name}-%{version}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-BuildRequires: libfastcommon-devel >= 1.0.64
-BuildRequires: libserverframe-devel >= 1.1.23
+BuildRequires: libserverframe-devel >= 1.1.24
 Requires: %__cp %__mv %__chmod %__grep %__mkdir %__install %__id
-Requires: libfastcommon >= 1.0.64
-Requires: libserverframe >= 1.1.23
+Requires: libserverframe >= 1.1.24
 Requires: FastCFS-auth-server = %{version}-%{release}
 Requires: %{FastCFSAuthClient} = %{version}-%{release}
 Requires: %{FastCFSAuthConfig} >= 2.0.0
@@ -33,8 +31,7 @@ Requires: %{FastCFSAuthClient} = %{version}-%{release}
 Summary: header files of FastCFS auth client
 
 %package -n %{FastCFSAuthClient}
-Requires: libfastcommon >= 1.0.64
-Requires: libserverframe >= 1.1.23
+Requires: libserverframe >= 1.1.24
 Summary: FastCFS auth client
 
 %package -n %{FastCFSAuthConfig}

diff --git a/FastCFS-vote.spec.in b/FastCFS-vote.spec.in
@@ -4,7 +4,7 @@
 %define CommitVersion %(echo $COMMIT_VERSION)
 
 Name: FastCFS-vote
-Version: 3.7.0
+Version: 3.7.1
 Release: 1%{?dist}
 Summary: the vote client library and config files of FastCFS. FastCFS is a high performance cloud native distributed file system for databases, KVM and K8s
 License: AGPL v3.0
@@ -14,11 +14,9 @@ Source: http://github.com/happyfish100/FastCFS/%{name}-%{version}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-BuildRequires: libfastcommon-devel >= 1.0.64
-BuildRequires: libserverframe-devel >= 1.1.23
+BuildRequires: libserverframe-devel >= 1.1.24
 Requires: %__cp %__mv %__chmod %__grep %__mkdir %__install %__id
-Requires: libfastcommon >= 1.0.64
-Requires: libserverframe >= 1.1.23
+Requires: libserverframe >= 1.1.24
 Requires: FastCFS-vote-server = %{version}-%{release}
 Requires: %{FastCFSVoteClient} = %{version}-%{release}
 Requires: %{FastCFSVoteConfig} >= 3.5.0
@@ -33,8 +31,7 @@ Requires: %{FastCFSVoteClient} = %{version}-%{release}
 Summary: header files of FastCFS vote client
 
 %package -n %{FastCFSVoteClient}
-Requires: libfastcommon >= 1.0.64
-Requires: libserverframe >= 1.1.23
+Requires: libserverframe >= 1.1.24
 Summary: FastCFS vote client
 
 %package -n %{FastCFSVoteConfig}

diff --git a/FastCFS.spec.in b/FastCFS.spec.in
@@ -8,7 +8,7 @@
 %define CommitVersion %(echo $COMMIT_VERSION)
 
 Name: FastCFS
-Version: 3.7.0
+Version: 3.7.1
 Release: 1%{?dist}
 Summary: a high performance cloud native distributed file system for databases, KVM and K8s
 License: AGPL v3.0
@@ -18,8 +18,8 @@ Source: http://github.com/happyfish100/FastCFS/%{name}-%{version}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: fastDIR-devel >= 3.7.0
-BuildRequires: faststore-devel >= 3.7.0
+BuildRequires: fastDIR-devel >= 3.7.1
+BuildRequires: faststore-devel >= 3.7.1
 BuildRequires: fuse3-devel >= 3.10.5
 Requires: %__cp %__mv %__chmod %__grep %__mkdir %__install %__id
 Requires: %{FastCFSFused} = %{version}-%{release}
@@ -36,25 +36,25 @@ Requires: %{FastCFSFuseConfig} >= 1.0.0
 Summary: FastCFS fuse
 
 %package -n %{FastCFSUtils}
-Requires: libserverframe >= 1.1.23
+Requires: libserverframe >= 1.1.24
 Summary: FastCFS utils 
 
 %package -n %{FastCFSAPI}
-Requires: fastDIR-client >= 3.7.0
-Requires: faststore-client >= 3.7.0
+Requires: fastDIR-client >= 3.7.1
+Requires: faststore-client >= 3.7.1
 Summary: FastCFS api library
 
 %package -n %{FastCFSAPIDevel}
 Requires: %{FastCFSAPI} = %{version}-%{release}
 Summary: header files of FastCFS api library
 
 %package -n %{FastCFSAuthServer}
-Requires: fastDIR-client >= 3.7.0
+Requires: fastDIR-client >= 3.7.1
 Requires: FastCFS-auth-config >= 2.0.0
 Summary: FastCFS auth server
 
 %package -n %{FastCFSVoteServer}
-Requires: libserverframe >= 1.1.23
+Requires: libserverframe >= 1.1.24
 Requires: FastCFS-vote-config >= 3.5.0
 Summary: FastCFS vote server
 

diff --git a/README-zh_CN.md b/README-zh_CN.md
@@ -24,7 +24,7 @@ FastCFS 是一款强一致性、高性能、高可用、支持百亿级海量文
 
 ## 2. 当前版本
 
-V3.7.0
+V3.7.1
 
 ## 3. 支持的操作系统
 
@@ -37,12 +37,12 @@ V3.7.0
     * [Python](https://python.org/) (版本 3.5 或更高版本)
     * [Ninja](https://ninja-build.org/) (版本 1.7 或更高版本)
     * [gcc](https://www.gnu.org/software/gcc/) (版本 4.7.0 或更高版本)
-* [libfastcommon](https://gitee.com/fastdfs100/libfastcommon) (tag: V1.0.64)
-* [libserverframe](https://gitee.com/fastdfs100/libserverframe) (tag: V1.1.23)
-* [libdiskallocator](https://gitee.com/fastdfs100/libdiskallocator) (tag: V1.0.9)
-* [fastDIR](https://gitee.com/fastdfs100/fastDIR) (tag: V3.7.0)
-* [faststore](https://gitee.com/fastdfs100/faststore) (tag: V3.7.0)
-* [FastCFS](https://gitee.com/fastdfs100/FastCFS) (tag: V3.7.0)
+* [libfastcommon](https://gitee.com/fastdfs100/libfastcommon) (tag: V1.0.65)
+* [libserverframe](https://gitee.com/fastdfs100/libserverframe) (tag: V1.1.24)
+* [libdiskallocator](https://gitee.com/fastdfs100/libdiskallocator) (tag: V1.0.10)
+* [fastDIR](https://gitee.com/fastdfs100/fastDIR) (tag: V3.7.1)
+* [faststore](https://gitee.com/fastdfs100/faststore) (tag: V3.7.1)
+* [FastCFS](https://gitee.com/fastdfs100/FastCFS) (tag: V3.7.1)
 
 ## 5. 部署 & 运维
 

diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ FastCFS can be used as the back-end storage of databases (MySQL, PostgresSQL, Or
 
 ## 2. Current Version
 
-V3.7.0
+V3.7.1
 
 ## 3. Supported Platforms
 
@@ -42,12 +42,12 @@ V3.7.0
     * [Python](https://python.org/) (version 3.5 or newer)
     * [Ninja](https://ninja-build.org/) (version 1.7 or newer)
     * [gcc](https://www.gnu.org/software/gcc/) (version 4.7.0 or newer)
-* [libfastcommon](https://github.com/happyfish100/libfastcommon) (tag: V1.0.64)
-* [libserverframe](https://github.com/happyfish100/libserverframe) (tag: V1.1.23)
-* [libdiskallocator](https://github.com/happyfish100/libdiskallocator) (tag: V1.0.9)
-* [fastDIR](https://github.com/happyfish100/fastDIR) (tag: V3.7.0)
-* [faststore](https://github.com/happyfish100/faststore) (tag: V3.7.0)
-* [FastCFS](https://github.com/happyfish100/FastCFS) (tag: V3.7.0)
+* [libfastcommon](https://github.com/happyfish100/libfastcommon) (tag: V1.0.65)
+* [libserverframe](https://github.com/happyfish100/libserverframe) (tag: V1.1.24)
+* [libdiskallocator](https://github.com/happyfish100/libdiskallocator) (tag: V1.0.10)
+* [fastDIR](https://github.com/happyfish100/fastDIR) (tag: V3.7.1)
+* [faststore](https://github.com/happyfish100/faststore) (tag: V3.7.1)
+* [FastCFS](https://github.com/happyfish100/FastCFS) (tag: V3.7.1)
 
 ## 5. Installation
 

diff --git a/docs/fcfs-ops-tool-zh_CN.md b/docs/fcfs-ops-tool-zh_CN.md
@@ -59,14 +59,14 @@ fcfs.settings 包括两个字段 ***fastcfs_version*** 和 ***fuseclient_ips***
 fcfs.settings 配置文件内容举例:
 
 ```
-# 要安装的集群版本号（例如：3.7.0）
-fastcfs_version=3.7.0
+# 要安装的集群版本号（例如：3.7.1）
+fastcfs_version=3.7.1
 
 # 要安装 fuseclient 客户端的IP列表，多个ip以英文逗号分隔
 fuseclient_ips=10.0.1.14
 ```
 
-***注：推荐使用 3.7.0 及更高版本用于集群部署。***
+***注：推荐使用 3.7.1 及更高版本用于集群部署。***
 
 #### 1.4.2. conf
 
@@ -361,8 +361,8 @@ fcfs_conf.settings 包括以下六种字段：
 fcfs_conf.settings 配置文件内容举例:
 
 ```
-# 要生成配置的集群版本号（例如：3.7.0）
-fastcfs_version=3.7.0
+# 要生成配置的集群版本号（例如：3.7.1）
+fastcfs_version=3.7.1
 
 # 集群主机列表和分组
 vote_ips=10.0.1.11,10.0.1.12,10.0.1.13
@@ -374,7 +374,7 @@ fstore_group_2=10.0.2.14,10.0.2.15,10.0.2.16
 data_group_count=256
 ```
 
-***注：推荐使用 3.7.0 及以后的版本用于生成集群配置文件，尤其是vote（投票）模块。***
+***注：推荐使用 3.7.1 及以后的版本用于生成集群配置文件，尤其是vote（投票）模块。***
 
 ### 2.3. fcfs_conf.sh工具命令介绍
 
@@ -416,6 +416,6 @@ conf_tpl_tar.sh <version> [update]
 
 举例:
 
-> ./conf_tpl_tar.sh 3.7.0 update
+> ./conf_tpl_tar.sh 3.7.1 update
 
-将在当前目录创建配置模版压缩包文件 **conf.3.7.0.tpl.tar.gz**。
+将在当前目录创建配置模版压缩包文件 **conf.3.7.1.tpl.tar.gz**。
diff --git a/docs/fcfs-ops-tool.md b/docs/fcfs-ops-tool.md
@@ -54,13 +54,13 @@ fcfs.settings content Example:
 
 ```
 # Version of FastCFS cluster
-fastcfs_version=3.6.3
+fastcfs_version=3.7.1
 
 # Hosts which fuseclient will install，multiple hosts separated by comma
 fuseclient_ips=10.0.1.14
 ```
 
-***Tip：Use version 3.6.3 and later for deploy.***
+***Tip：Use version 3.7.1 and later for deploy.***
 
 #### 1.4.2. conf
 
@@ -348,7 +348,7 @@ fcfs_conf.settings content Example:
 
 ```
 # Version of FastCFS cluster
-fastcfs_version=3.6.3
+fastcfs_version=3.7.1
 
 # Cluster hosts list and group count
 vote_ips=10.0.1.11,10.0.1.12,10.0.1.13
@@ -360,7 +360,7 @@ fstore_group_2=10.0.2.14,10.0.2.15,10.0.2.16
 data_group_count=128
 ```
 
-***Tip：Use version 3.6.3 and later for crearte config files, especially for vote server.***
+***Tip：Use version 3.7.1 and later for crearte config files, especially for vote server.***
 
 ### 2.3. fcfs_conf.sh Tool commands introduction
 
@@ -402,6 +402,6 @@ conf_tpl_tar.sh <version> [update]
 
 Exmaple:
 
-> ./conf_tpl_tar.sh 3.6.3 update
+> ./conf_tpl_tar.sh 3.7.1 update
 
-It will create tar file **conf.3.6.3.tpl.tar.gz** in current dir.
+It will create tar file **conf.3.7.1.tpl.tar.gz** in current dir.
diff --git a/src/auth/common/auth_global.c b/src/auth/common/auth_global.c
@@ -16,5 +16,5 @@
 #include "auth_global.h"
 
 FCFSAuthGlobalVars g_fcfs_auth_global_vars = {
-    {3, 7, 0}
+    {3, 7, 1}
 };
diff --git a/src/common/fcfs_global.c b/src/common/fcfs_global.c
@@ -16,5 +16,5 @@
 #include "fcfs_global.h"
 
 FCFSGlobalVars g_fcfs_global_vars = {
-    {3, 7, 0}
+    {3, 7, 1}
 };
diff --git a/src/vote/common/vote_global.c b/src/vote/common/vote_global.c
@@ -16,5 +16,5 @@
 #include "vote_global.h"
 
 FCFSVoteGlobalVars g_fcfs_vote_global_vars = {
-    {3, 7, 0}
+    {3, 7, 1}
 };