Skip to content
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

feat: support dubbo #3224

Merged
merged 4 commits into from
Jan 20, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,15 @@ jobs:
- name: Linux Before install
run: sudo ./.travis/${{ matrix.os_name }}_runner.sh before_install

- name: Start Dubbo Backend
if: matrix.os_name == 'linux_openresty'
run: |
sudo apt install -y maven
cd t/lib/dubbo-backend
mvn package
cd dubbo-backend-provider/target
java -Djava.net.preferIPv4Stack=true -jar dubbo-demo-provider.one-jar.jar > /tmp/java.log &
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

It is better to move t/lib/dubbo-backend to a separate repo, and only need to download the compiled jar when running CI.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As the content of Java code is depended on what you want to test, it is inconvenient to move it to a separate repo.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mvn package + java -Djava.net.preferIPv4Stack=true

How long does it usually take?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@membphis
32 seconds

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is acceptable


- name: Install Redis Cluster
if: startsWith(matrix.os_name, 'linux_openresty')
run: |
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ client_body_temp
utils/lj-releng
utils/reindex
default.etcd/
t/lib/dubbo-backend/dubbo-backend-interface/target/
t/lib/dubbo-backend/dubbo-backend-provider/target/
.idea/
*.iml
\.*
Expand Down
5 changes: 3 additions & 2 deletions .travis/ASF-Release.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,15 @@ DISCLAIMER.txt
LICENSE*.txt
NOTICE.txt

# Exclude travis CI files
# Exclude CI files
build-cache
deps
test-nginx
grpc_server_example
.travis.yml
grpcurl
t/servroot
t/lib/dubbo-backend/dubbo-backend-provider/target
t/lib/dubbo-backend/dubbo-backend-interface/target

conf
.travis/openwhisk-utilities
Expand Down
53 changes: 53 additions & 0 deletions .travis/apisix_cli_test/test_dubbo.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
#!/usr/bin/env bash

#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

. ./.travis/apisix_cli_test/common.sh

# enable dubbo
echo '
plugins:
- dubbo-proxy
' > conf/config.yaml

make init

if ! grep "location @dubbo_pass " conf/nginx.conf > /dev/null; then
echo "failed: dubbo location not found in nginx.conf"
exit 1
fi

echo "passed: found dubbo location in nginx.conf"

# dubbo multiplex configuration
echo '
plugins:
- dubbo-proxy
plugin_attr:
dubbo-proxy:
upstream_multiplex_count: 16
' > conf/config.yaml

make init

if ! grep "multi 16;" conf/nginx.conf > /dev/null; then
echo "failed: dubbo multiplex configuration not found in nginx.conf"
exit 1
fi

echo "passed: found dubbo multiplex configuration in nginx.conf"
2 changes: 1 addition & 1 deletion .travis/linux_openresty_1_15_runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@


export OPENRESTY_VERSION=1.15.8.2
. ./.travis/linux_openresty_runner.sh
. ./.travis/linux_openresty_common_runner.sh
2 changes: 1 addition & 1 deletion .travis/linux_openresty_1_17_runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@


export OPENRESTY_VERSION=1.17.8.2
. ./.travis/linux_openresty_runner.sh
. ./.travis/linux_openresty_common_runner.sh
167 changes: 167 additions & 0 deletions .travis/linux_openresty_common_runner.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,167 @@
#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

. ./.travis/common.sh

before_install() {
sudo cpanm --notest Test::Nginx >build.log 2>&1 || (cat build.log && exit 1)
docker pull redis:3.0-alpine
docker run --rm -itd -p 6379:6379 --name apisix_redis redis:3.0-alpine
docker run --rm -itd -e HTTP_PORT=8888 -e HTTPS_PORT=9999 -p 8888:8888 -p 9999:9999 mendhak/http-https-echo
# Runs Keycloak version 10.0.2 with inbuilt policies for unit tests
docker run --rm -itd -e KEYCLOAK_USER=admin -e KEYCLOAK_PASSWORD=123456 -p 8090:8080 -p 8443:8443 sshniro/keycloak-apisix
# spin up kafka cluster for tests (1 zookeper and 1 kafka instance)
docker pull bitnami/zookeeper:3.6.0
docker pull bitnami/kafka:latest
docker network create kafka-net --driver bridge
docker run --name zookeeper-server -d -p 2181:2181 --network kafka-net -e ALLOW_ANONYMOUS_LOGIN=yes bitnami/zookeeper:3.6.0
docker run --name kafka-server1 -d --network kafka-net -e ALLOW_PLAINTEXT_LISTENER=yes -e KAFKA_CFG_ZOOKEEPER_CONNECT=zookeeper-server:2181 -e KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://127.0.0.1:9092 -p 9092:9092 -e KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE=true bitnami/kafka:latest
docker pull bitinit/eureka
docker run --name eureka -d -p 8761:8761 --env ENVIRONMENT=apisix --env spring.application.name=apisix-eureka --env server.port=8761 --env eureka.instance.ip-address=127.0.0.1 --env eureka.client.registerWithEureka=true --env eureka.client.fetchRegistry=false --env eureka.client.serviceUrl.defaultZone=http://127.0.0.1:8761/eureka/ bitinit/eureka
sleep 5
docker exec -i kafka-server1 /opt/bitnami/kafka/bin/kafka-topics.sh --create --zookeeper zookeeper-server:2181 --replication-factor 1 --partitions 1 --topic test2

# start skywalking
docker run --rm --name skywalking -d -p 1234:1234 -p 11800:11800 -p 12800:12800 apache/skywalking-oap-server
}

do_install() {
export_or_prefix

./utils/linux-install-openresty.sh

./utils/linux-install-luarocks.sh
sudo luarocks install luacheck > build.log 2>&1 || (cat build.log && exit 1)

./utils/linux-install-etcd-client.sh

if [ ! -f "build-cache/apisix-master-0.rockspec" ]; then
create_lua_deps

else
src=`md5sum rockspec/apisix-master-0.rockspec | awk '{print $1}'`
src_cp=`md5sum build-cache/apisix-master-0.rockspec | awk '{print $1}'`
if [ "$src" = "$src_cp" ]; then
echo "Use lua deps cache"
sudo cp -r build-cache/deps ./
else
create_lua_deps
fi
fi

# sudo apt-get install tree -y
# tree deps

git clone https://github.com/iresty/test-nginx.git test-nginx
make utils

git clone https://github.com/apache/openwhisk-utilities.git .travis/openwhisk-utilities
cp .travis/ASF* .travis/openwhisk-utilities/scancode/

ls -l ./
if [ ! -f "build-cache/grpc_server_example" ]; then
wget https://github.com/iresty/grpc_server_example/releases/download/20200901/grpc_server_example-amd64.tar.gz
tar -xvf grpc_server_example-amd64.tar.gz
mv grpc_server_example build-cache/
fi

if [ ! -f "build-cache/proto/helloworld.proto" ]; then
if [ ! -f "grpc_server_example/main.go" ]; then
git clone https://github.com/iresty/grpc_server_example.git grpc_server_example
fi

cd grpc_server_example/
mv proto/ ../build-cache/
cd ..
fi

if [ ! -f "build-cache/grpcurl" ]; then
wget https://github.com/api7/grpcurl/releases/download/20200314/grpcurl-amd64.tar.gz
tar -xvf grpcurl-amd64.tar.gz
mv grpcurl build-cache/
fi
}

script() {
export_or_prefix
openresty -V

./build-cache/grpc_server_example &

./bin/apisix help
./bin/apisix init
./bin/apisix init_etcd
./bin/apisix start

#start again --> fial
res=`./bin/apisix start`
if [ "$res" != "APISIX is running..." ]; then
echo "failed: APISIX runs repeatedly"
exit 1
fi

#kill apisix
sudo kill -9 `ps aux | grep apisix | grep nginx | awk '{print $2}'`

#start -> ok
res=`./bin/apisix start`
if [ "$res" == "APISIX is running..." ]; then
echo "failed: shouldn't stop APISIX running after kill the old process."
exit 1
fi

sleep 1
cat logs/error.log

sudo sh ./t/grpc-proxy-test.sh
sleep 1

./bin/apisix stop
sleep 1

sudo bash ./utils/check-plugins-code.sh

make lint && make license-check || exit 1

# APISIX_ENABLE_LUACOV=1 PERL5LIB=.:$PERL5LIB prove -Itest-nginx/lib -r t
PERL5LIB=.:$PERL5LIB prove -Itest-nginx/lib -r t
}

after_success() {
# cat luacov.stats.out
# luacov-coveralls
echo "done"
}

case_opt=$1
shift

case ${case_opt} in
before_install)
before_install "$@"
;;
do_install)
do_install "$@"
;;
script)
script "$@"
;;
after_success)
after_success "$@"
;;
esac
Loading