This is an automated email from the ASF dual-hosted git repository. wohali pushed a commit to branch jenkins-drop-jessie in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 63efc71b912071fe9b4bbc8677daf1b19cea1065 Author: Kyle Snavely <[email protected]> AuthorDate: Tue Jan 7 19:10:14 2020 -0700 Make the rexi:stream2 interface unacked message limit configurable (#2360) Also lower the default stream_limit to 5 based on the results of performance testing. Co-authored-by: Adam Kocoloski <[email protected]> Co-authored-by: Kyle Snavely <[email protected]> --- build-aux/Jenkinsfile.full | 7 +++++-- rel/overlay/etc/default.ini | 1 + src/rexi/src/rexi.erl | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full index 9e1f5c6..235329c 100644 --- a/build-aux/Jenkinsfile.full +++ b/build-aux/Jenkinsfile.full @@ -578,10 +578,10 @@ pipeline { echo 'Building Debian repo...' sh ''' git clone https://github.com/apache/couchdb-pkg - cp js/debian-jessie/*.deb pkgs/jessie - reprepro -b couchdb-pkg/repo includedeb jessie pkgs/jessie/*.deb cp js/debian-stretch/*.deb pkgs/stretch reprepro -b couchdb-pkg/repo includedeb stretch pkgs/stretch/*.deb + cp js/debian-buster/*.deb pkgs/stretch + reprepro -b couchdb-pkg/repo includedeb stretch pkgs/buster/*.deb cp js/ubuntu-xenial/*.deb pkgs/xenial reprepro -b couchdb-pkg/repo includedeb xenial pkgs/xenial/*.deb cp js/ubuntu-bionic/*.deb pkgs/bionic @@ -592,8 +592,10 @@ pipeline { sh ''' cp js/centos-6/*rpm pkgs/centos6 cp js/centos-7/*rpm pkgs/centos7 + cp js/centos-8/*rpm pkgs/centos8 cd pkgs/centos6 && createrepo --database . cd ../centos7 && createrepo --database . + cd ../centos8 && createrepo --database . ''' echo 'Building tree to upload...' @@ -602,6 +604,7 @@ pipeline { mv couchdb-pkg/repo/dists $BRANCH_NAME/debian mv pkgs/centos6/* $BRANCH_NAME/el6 mv pkgs/centos7/* $BRANCH_NAME/el7 + mv pkgs/centos8/* $BRANCH_NAME/el8 mv apache-couchdb-*.tar.gz $BRANCH_NAME/source cd $BRANCH_NAME/source ls -1tr | head -n -10 | xargs -d '\n' rm -f -- diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini index f5f0578..669977e 100644 --- a/rel/overlay/etc/default.ini +++ b/rel/overlay/etc/default.ini @@ -214,6 +214,7 @@ port = 6984 ; [rexi] ; buffer_count = 2000 ; server_per_node = true +; stream_limit = 5 ; [global_changes] ; max_event_delay = 25 diff --git a/src/rexi/src/rexi.erl b/src/rexi/src/rexi.erl index ead5bee..170503b 100644 --- a/src/rexi/src/rexi.erl +++ b/src/rexi/src/rexi.erl @@ -211,9 +211,10 @@ stream(Msg, Limit, Timeout) -> exit(timeout) end. -%% @equiv stream2(Msg, 10, 300000) +%% @equiv stream2(Msg, 5, 300000) stream2(Msg) -> - stream2(Msg, 10, 300000). + Limit = config:get_integer("rexi", "stream_limit", 5), + stream2(Msg, Limit). %% @equiv stream2(Msg, Limit, 300000) stream2(Msg, Limit) ->
