diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f8f6162e..0d10c884b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # nuster Changelog +## 5.2.0.22 - 2020-07-08 + +Backported HAProxy v2.2.0 + +### Added + +* Use thread to do disk load when thread is enabled +* Use a new versioning system + ## 5.0.12.21 - 2020-06-09 ### Changed diff --git a/Download.md b/Download.md index 056568db4..550baa997 100644 --- a/Download.md +++ b/Download.md @@ -3,7 +3,8 @@ Branch | nuster version | Released | Status | Download ------ | -------------- | -------- | ------ | -------- -master | | | HAProxy v2.2-dev8 | +master | | | HAProxy v2.3-dev0 | +v5.2 | 5.2.0.22 | 2020-07-08 | Stable version | [nuster-5.2.0.22.tar.gz][5] H2.1 | 5.0.12.21 | 2020-06-09 | Stable version | [nuster-5.0.12.21.tar.gz][4] H2.0 | 4.0.1.20 | 2020-04-11 | Unmaintained | ~nuster-4.0.1.20.tar.gz~ H1.9 | 3.2.5.19 | 2020-04-13 | Stable version | [nuster-3.2.5.19.tar.gz][3] @@ -14,13 +15,17 @@ H1.7 | 1.0.3.17 | 2019-11-02 | Unmaintained | [nuster-1.0.3.17.tar. [2]:https://github.com/jiangwenyuan/nuster/releases/download/v2.0.16.18/nuster-2.0.16.18.tar.gz [3]:https://github.com/jiangwenyuan/nuster/releases/download/v3.2.5.19/nuster-3.2.5.19.tar.gz [4]:https://github.com/jiangwenyuan/nuster/releases/download/v5.0.12.21/nuster-5.0.12.21.tar.gz +[5]:https://github.com/jiangwenyuan/nuster/releases/download/v5.2.0.22/nuster-5.2.0.22.tar.gz ## Versioning -Nuster uses a version system as MAJOR.MINOR.PATCH.HAPROXY_BRANCH. +Starting with v5.2, nuster uses a new version system as NUSTER_VERSION.PATCH.HAPROXY_BRANCH. -* MAJOR: big feature release of nuster -* MINOR: small features, haproxy branch update +* NUSTER_VERSION + * Designated as two numbers separated by a dot, for example "5.2" + * Grows as a decimal number increased by 0.1 per version + * even version for stable release, based on HAProxy even version, only bugfixes will be backported, for example "5.2" + * odd version for development release, based on HAProxy odd version, new features, updates, bugfixes, for example "5.3" * PATCH: bug fixes, haproxy minor updates * HAPROXY_BRANCH: 17 stands for HAProxy v1.7.x, 18 for HAProxy v1.8.x @@ -30,6 +35,7 @@ https://github.com/jiangwenyuan/nuster/releases | nuster version | Base HAProxy version | -------------- | --------------- +| [5.2.0.22](https://github.com/jiangwenyuan/nuster/releases/tag/v5.2.0.22) | 2.2.0 | [5.0.12.21](https://github.com/jiangwenyuan/nuster/releases/tag/v5.0.12.21) | 2.1.7 | [5.0.11.21](https://github.com/jiangwenyuan/nuster/releases/tag/v5.0.11.21) | 2.1.5 | [5.0.10.21](https://github.com/jiangwenyuan/nuster/releases/tag/v5.0.10.21) | 2.1.4 diff --git a/README-CN.md b/README-CN.md index 9babac084..b592e7b33 100644 --- a/README-CN.md +++ b/README-CN.md @@ -327,6 +327,8 @@ dict.nosql.used: 0 启动后每次加载最多 `disk-loader` 个硬盘缓存文件的信息到内存（默认100） +`USE_THREAD` 启用时, 会有一个单独的线程进行加载，这时忽略该参数。 + ### disk-saver 每次检查最多 `disk-saver` 个data，并将需要保存至硬盘的data保存到硬盘（默认100） diff --git a/README-JP.md b/README-JP.md index b9303d56e..6d8ef7e9e 100644 --- a/README-JP.md +++ b/README-JP.md @@ -329,6 +329,8 @@ dict.nosql.used: 0 起動後、一回で最多`disk-loader`個のfileをチェックして、情報をロードする(デフォルト、100). +`USE_THREAD`の場合, 単独のthreadでロードする、このパラメータは無視する。 + ### disk-saver 一回で最多`disk-saver`個のdataをチェックして、ディスクに保存する必要あるデータを保存する(デフォルト、100). diff --git a/README.md b/README.md index c0b98d946..95e0c17c8 100644 --- a/README.md +++ b/README.md @@ -341,6 +341,8 @@ After the start of nuster, master process will load information about data previ During one iteration no more than `disk-loader` files are loaded(by default, 100). +If `USE_THREAD` is used, a separate thread will be created to load disk files and this parameter is ignored. + ### disk-saver Master process will save `disk sync` cache data periodically. diff --git a/include/nuster/nuster.h b/include/nuster/nuster.h index 242df87a3..2f5c1c1c8 100644 --- a/include/nuster/nuster.h +++ b/include/nuster/nuster.h @@ -22,7 +22,7 @@ #ifndef _NUSTER_H #define _NUSTER_H -#define NUSTER_VERSION "5.0.10.21" +#define NUSTER_VERSION "5.2.0.22" #define NUSTER_COPYRIGHT "2017-present, Jiang Wenyuan, " #include