From 6936ba165b50e97ddb8cda0b2a94865a4a416fc8 Mon Sep 17 00:00:00 2001 From: Star <1599603313@qq.com> Date: Mon, 30 May 2022 00:12:57 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E2=AD=90=EF=B8=8F:=20set=20rpc=20invoke=20?= =?UTF-8?q?timeout=3D3s=20(#197)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sonic-server-common/src/main/resources/application-dubbo.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sonic-server-common/src/main/resources/application-dubbo.yml b/sonic-server-common/src/main/resources/application-dubbo.yml index 6ec26527..ebd96b78 100644 --- a/sonic-server-common/src/main/resources/application-dubbo.yml +++ b/sonic-server-common/src/main/resources/application-dubbo.yml @@ -11,4 +11,7 @@ dubbo: timeout: 60000 check: true consumer: - check: false \ No newline at end of file + check: false + timeout: 3000 + provider: + timeout: 3000 \ No newline at end of file From 88831544cc986c48c9a8e2355e539faa05b58fc5 Mon Sep 17 00:00:00 2001 From: Star <1599603313@qq.com> Date: Mon, 30 May 2022 00:20:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E2=AD=90=EF=B8=8F:=20set=20rpc=20invoke=20?= =?UTF-8?q?timeout=3D5s=20(#198)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sonic-server-common/src/main/resources/application-dubbo.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sonic-server-common/src/main/resources/application-dubbo.yml b/sonic-server-common/src/main/resources/application-dubbo.yml index ebd96b78..e2572e31 100644 --- a/sonic-server-common/src/main/resources/application-dubbo.yml +++ b/sonic-server-common/src/main/resources/application-dubbo.yml @@ -12,6 +12,6 @@ dubbo: check: true consumer: check: false - timeout: 3000 + timeout: 5000 provider: - timeout: 3000 \ No newline at end of file + timeout: 5000 \ No newline at end of file From 2e49b5314f107a647cfb97cca136544e7e0630d5 Mon Sep 17 00:00:00 2001 From: ZhouYixun <291028775@qq.com> Date: Mon, 30 May 2022 20:18:01 +0800 Subject: [PATCH 3/4] =?UTF-8?q?rc=E5=8F=91=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 8 ++++---- sonic-server-controller/pom.xml | 2 +- sonic-server-folder/pom.xml | 2 +- sonic-server-gateway/pom.xml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b61f2cf2..764ccbdc 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -23,12 +23,12 @@ jobs: - name: git Actions uses: srt32/git-actions@v0.0.3 - name: get agent - run: git clone https://github.com/SonicCloudOrg/sonic-agent.git && cd sonic-agent && mvn package -Plinux-x86_64 && docker build -t sonicorg/sonic-agent-linux:v1.4.0-beta -f src/main/docker/Dockerfile . + run: git clone https://github.com/SonicCloudOrg/sonic-agent.git && cd sonic-agent && mvn package -Plinux-x86_64 && docker build -t sonicorg/sonic-agent-linux:v1.4.0-rc -f src/main/docker/Dockerfile . - name: push - run: docker push sonicorg/sonic-agent-linux:v1.4.0-beta + run: docker push sonicorg/sonic-agent-linux:v1.4.0-rc - name: login docker hub run: echo "${{ secrets.ACCESS_TOKEN_ALIYUN }}" | docker login --username=小虫哔哔 registry.cn-hangzhou.aliyuncs.com --password-stdin - name: tag - run: docker tag sonicorg/sonic-agent-linux:v1.4.0-beta registry.cn-hangzhou.aliyuncs.com/sonic-cloud/sonic-agent-linux:v1.4.0-beta && docker tag sonicorg/sonic-server-controller:v1.4.0-beta registry.cn-hangzhou.aliyuncs.com/sonic-cloud/sonic-server-controller:v1.4.0-beta && docker tag sonicorg/sonic-server-folder:v1.4.0-beta registry.cn-hangzhou.aliyuncs.com/sonic-cloud/sonic-server-folder:v1.4.0-beta && docker tag sonicorg/sonic-server-gateway:v1.4.0-beta registry.cn-hangzhou.aliyuncs.com/sonic-cloud/sonic-server-gateway:v1.4.0-beta + run: docker tag sonicorg/sonic-agent-linux:v1.4.0-rc registry.cn-hangzhou.aliyuncs.com/sonic-cloud/sonic-agent-linux:v1.4.0-rc && docker tag sonicorg/sonic-server-controller:v1.4.0-rc registry.cn-hangzhou.aliyuncs.com/sonic-cloud/sonic-server-controller:v1.4.0-rc && docker tag sonicorg/sonic-server-folder:v1.4.0-rc registry.cn-hangzhou.aliyuncs.com/sonic-cloud/sonic-server-folder:v1.4.0-rc && docker tag sonicorg/sonic-server-gateway:v1.4.0-rc registry.cn-hangzhou.aliyuncs.com/sonic-cloud/sonic-server-gateway:v1.4.0-rc - name: push - run: docker push registry.cn-hangzhou.aliyuncs.com/sonic-cloud/sonic-agent-linux:v1.4.0-beta && docker push registry.cn-hangzhou.aliyuncs.com/sonic-cloud/sonic-server-controller:v1.4.0-beta && docker push registry.cn-hangzhou.aliyuncs.com/sonic-cloud/sonic-server-folder:v1.4.0-beta && docker push registry.cn-hangzhou.aliyuncs.com/sonic-cloud/sonic-server-gateway:v1.4.0-beta + run: docker push registry.cn-hangzhou.aliyuncs.com/sonic-cloud/sonic-agent-linux:v1.4.0-rc && docker push registry.cn-hangzhou.aliyuncs.com/sonic-cloud/sonic-server-controller:v1.4.0-rc && docker push registry.cn-hangzhou.aliyuncs.com/sonic-cloud/sonic-server-folder:v1.4.0-rc && docker push registry.cn-hangzhou.aliyuncs.com/sonic-cloud/sonic-server-gateway:v1.4.0-rc diff --git a/sonic-server-controller/pom.xml b/sonic-server-controller/pom.xml index 56e0798f..84582628 100644 --- a/sonic-server-controller/pom.xml +++ b/sonic-server-controller/pom.xml @@ -10,7 +10,7 @@ 4.0.0 sonic-server-controller - 1.4.0-beta + 1.4.0-rc jar diff --git a/sonic-server-folder/pom.xml b/sonic-server-folder/pom.xml index 9b3cc207..f5e5e4c0 100644 --- a/sonic-server-folder/pom.xml +++ b/sonic-server-folder/pom.xml @@ -10,7 +10,7 @@ 4.0.0 sonic-server-folder - 1.4.0-beta + 1.4.0-rc jar diff --git a/sonic-server-gateway/pom.xml b/sonic-server-gateway/pom.xml index 8e2bf705..932f946d 100644 --- a/sonic-server-gateway/pom.xml +++ b/sonic-server-gateway/pom.xml @@ -10,7 +10,7 @@ 4.0.0 sonic-server-gateway - 1.4.0-beta + 1.4.0-rc jar From 269e1b01211e511180a872a3d2884eebfe9ac666 Mon Sep 17 00:00:00 2001 From: ZhouYixun <291028775@qq.com> Date: Mon, 30 May 2022 20:23:02 +0800 Subject: [PATCH 4/4] rc2 --- docker-compose.yml | 8 ++++---- docker-compose2.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index eb3f0e6d..05bb26e2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ services: ports: - "${ZOOKEEPER_PORT}:2181" sonic-server-gateway: - image: "registry.cn-hangzhou.aliyuncs.com/sonic-cloud/sonic-server-gateway:v1.4.0-beta" + image: "registry.cn-hangzhou.aliyuncs.com/sonic-cloud/sonic-server-gateway:v1.4.0-rc" environment: - SONIC_GATEWAY_PORT - ZOOKEEPER_HOST @@ -27,7 +27,7 @@ services: - "${SONIC_GATEWAY_PORT}:${SONIC_GATEWAY_PORT}" restart: on-failure sonic-server-controller: - image: "registry.cn-hangzhou.aliyuncs.com/sonic-cloud/sonic-server-controller:v1.4.0-beta" + image: "registry.cn-hangzhou.aliyuncs.com/sonic-cloud/sonic-server-controller:v1.4.0-rc" environment: - ZOOKEEPER_HOST - ZOOKEEPER_PORT @@ -63,7 +63,7 @@ services: - "${DUBBO_PORT}:${DUBBO_PORT}" restart: on-failure sonic-server-folder: - image: "registry.cn-hangzhou.aliyuncs.com/sonic-cloud/sonic-server-folder:v1.4.0-beta" + image: "registry.cn-hangzhou.aliyuncs.com/sonic-cloud/sonic-server-folder:v1.4.0-rc" environment: - SERVER_HOST - SONIC_GATEWAY_PORT @@ -86,7 +86,7 @@ services: ports: - "${SONIC_FOLDER_PORT}:${SONIC_FOLDER_PORT}" sonic-client-web: - image: "registry.cn-hangzhou.aliyuncs.com/sonic-cloud/sonic-client-web:v1.4.0-beta" + image: "registry.cn-hangzhou.aliyuncs.com/sonic-cloud/sonic-client-web:v1.4.0-rc" environment: - SERVER_HOST - SONIC_GATEWAY_PORT diff --git a/docker-compose2.yml b/docker-compose2.yml index e45f47e5..50c1386d 100644 --- a/docker-compose2.yml +++ b/docker-compose2.yml @@ -10,7 +10,7 @@ services: ports: - "${ZOOKEEPER_PORT}:2181" sonic-server-gateway: - image: "sonicorg/sonic-server-gateway:v1.4.0-beta" + image: "sonicorg/sonic-server-gateway:v1.4.0-rc" environment: - SONIC_GATEWAY_PORT - ZOOKEEPER_HOST @@ -27,7 +27,7 @@ services: - "${SONIC_GATEWAY_PORT}:${SONIC_GATEWAY_PORT}" restart: on-failure sonic-server-controller: - image: "sonicorg/sonic-server-controller:v1.4.0-beta" + image: "sonicorg/sonic-server-controller:v1.4.0-rc" environment: - ZOOKEEPER_HOST - ZOOKEEPER_PORT @@ -63,7 +63,7 @@ services: - "${DUBBO_PORT}:${DUBBO_PORT}" restart: on-failure sonic-server-folder: - image: "sonicorg/sonic-server-folder:v1.4.0-beta" + image: "sonicorg/sonic-server-folder:v1.4.0-rc" environment: - SERVER_HOST - SONIC_GATEWAY_PORT @@ -86,7 +86,7 @@ services: ports: - "${SONIC_FOLDER_PORT}:${SONIC_FOLDER_PORT}" sonic-client-web: - image: "sonicorg/sonic-client-web:v1.4.0-beta" + image: "sonicorg/sonic-client-web:v1.4.0-rc" environment: - SERVER_HOST - SONIC_GATEWAY_PORT