-
Notifications
You must be signed in to change notification settings - Fork 2.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
ngx_http_lua_upstream with tengine RBTREE performance optimization #1882
Open
lhanjian
wants to merge
10
commits into
alibaba:master
Choose a base branch
from
lhanjian:lua_upstream
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+2,270
−11
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
f29fcf3
ngx_http_lua_upstream with tengine RBTREE performance optimization
lhanjian 2978a29
add new lua-upstream modules to CI
lhanjian 0222520
add new lua_upstream modules to test yaml
lhanjian 96669f9
update
lhanjian 53c535c
fix format
lhanjian aac2ab3
update lua_upstream test
lhanjian 0f31d31
update lua upstream test
lhanjian 10f1492
fix test
lhanjian ac5cca9
fix test
lhanjian e828e63
update
lhanjian File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| sudo: required | ||
lhanjian marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| dist: focal | ||
|
|
||
| os: linux | ||
|
|
||
| language: c | ||
|
|
||
| cache: | ||
| apt: true | ||
| directories: | ||
| - download-cache | ||
|
|
||
| addons: | ||
| apt: | ||
| packages: | ||
| - axel | ||
| - libtest-base-perl | ||
| - libtext-diff-perl | ||
| - liburi-perl | ||
| - libwww-perl | ||
| - libtest-longstring-perl | ||
| - liblist-moreutils-perl | ||
|
|
||
| compiler: | ||
| - gcc | ||
|
|
||
| env: | ||
| global: | ||
| - LUAJIT_PREFIX=/opt/luajit21 | ||
| - LUAJIT_LIB=$LUAJIT_PREFIX/lib | ||
| - LD_LIBRARY_PATH=$LUAJIT_LIB:$LD_LIBRARY_PATH | ||
| - LUAJIT_INC=$LUAJIT_PREFIX/include/luajit-2.1 | ||
| - LUA_INCLUDE_DIR=$LUAJIT_INC | ||
| - LUA_CMODULE_DIR=/lib | ||
| - JOBS=3 | ||
| - NGX_BUILD_JOBS=$JOBS | ||
| matrix: | ||
| - NGINX_VERSION=1.21.4 | ||
| - NGINX_VERSION=1.25.1 | ||
|
|
||
| services: | ||
| - redis-server | ||
|
|
||
| install: | ||
| - echo $HOME | ||
| - if [ ! -d download-cache ]; then mkdir download-cache; fi | ||
| - if [ ! -f download-cache/ngx_http_redis-0.3.9.tar.gz ]; then wget -O download-cache/ngx_http_redis-0.3.9.tar.gz http://people.freebsd.org/~osa/ngx_http_redis-0.3.9.tar.gz; fi | ||
| - mkdir -p ~/work/nginx && cp download-cache/ngx_http_redis-0.3.9.tar.gz ~/work/nginx/ | ||
| - git clone https://github.com/openresty/nginx-devel-utils.git | ||
| - git clone https://github.com/openresty/openresty.git ../openresty | ||
| - git clone https://github.com/openresty/no-pool-nginx.git ../no-pool-nginx | ||
| - git clone https://github.com/simpl/ngx_devel_kit.git ../ndk-nginx-module | ||
| - git clone https://github.com/openresty/test-nginx.git | ||
| - git clone -b v2.1-agentzh https://github.com/openresty/luajit2.git | ||
| - git clone https://github.com/openresty/lua-nginx-module.git ../lua-nginx-module | ||
| - git clone https://github.com/openresty/lua-resty-core.git ../lua-resty-core | ||
| - git clone https://github.com/openresty/lua-resty-lrucache.git ../lua-resty-lrucache | ||
| - git clone https://github.com/openresty/nginx-eval-module.git ../eval-nginx-module | ||
| - git clone https://github.com/openresty/echo-nginx-module.git ../echo-nginx-module | ||
| - git clone https://github.com/openresty/set-misc-nginx-module.git ../set-misc-nginx-module | ||
|
|
||
| script: | ||
| - cd luajit2 | ||
| - make -j$JOBS CCDEBUG=-g Q= PREFIX=$LUAJIT_PREFIX CC=$CC XCFLAGS='-DLUA_USE_APICHECK -DLUA_USE_ASSERT -msse4.2' > build.log 2>&1 || (cat build.log && exit 1) | ||
| - sudo make install PREFIX=$LUAJIT_PREFIX > build.log 2>&1 || (cat build.log && exit 1) | ||
| - cd .. | ||
| - cpanm --sudo ./test-nginx | ||
| - export PATH=$PWD/work/nginx/sbin:$PWD/nginx-devel-utils:$PATH | ||
| - export NGX_BUILD_CC=$CC | ||
| - sh util/build.sh $NGINX_VERSION > build.log 2>&1 || (cat build.log && exit 1) | ||
| - nginx -V | ||
| - ldd `which nginx`|grep luajit | ||
| - prove -r t | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hi @lhanjian I have examined the test cases introduced by this module. I believe it is easy to run and pass, it does not depend on some other module or library. Could you try to make it work in our CI/CD workflow? only for lua-upstream module
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@chobits OK. ok i will try it soon
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@chobits test case of
ngx_http_lua_upstreamneed more dependencies, likeecho-nginx-module.and version of
test-nginxis too old to runngx_http_lua_upstream/t, so we can't run test ofngx_http_lua_upstream/tfor now.