You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2018/08/30 10:51:40 UTC
[incubator-servicecomb-saga] branch master updated (664b7e7 ->
9712969)
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git.
from 664b7e7 Update the ROADMAP.md
new 3e3751b SCB-868 Add kamon related configs to alpha docker-compose file.
new 9712969 SCB-868 polish the sh script
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
...compose.yaml => docker-compose-alpha-perf.yaml} | 47 ++++++----------------
saga-demo/saga-spring-demo/saga-demo.sh | 12 ++++--
2 files changed, 22 insertions(+), 37 deletions(-)
copy saga-demo/saga-spring-demo/{docker-compose.yaml => docker-compose-alpha-perf.yaml} (69%)
[incubator-servicecomb-saga] 01/02: SCB-868 Add kamon related
configs to alpha docker-compose file.
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git
commit 3e3751b4b0a086e6fc8b29c58972a140a922a883
Author: Zhen Ju <ju...@huawei.com>
AuthorDate: Thu Aug 30 17:20:33 2018 +0800
SCB-868 Add kamon related configs to alpha docker-compose file.
---
.../docker-compose-alpha-perf.yaml | 58 ++++++++++++++++++++++
saga-demo/saga-spring-demo/saga-demo.sh | 7 +++
2 files changed, 65 insertions(+)
diff --git a/saga-demo/saga-spring-demo/docker-compose-alpha-perf.yaml b/saga-demo/saga-spring-demo/docker-compose-alpha-perf.yaml
new file mode 100644
index 0000000..c0ab950
--- /dev/null
+++ b/saga-demo/saga-spring-demo/docker-compose-alpha-perf.yaml
@@ -0,0 +1,58 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+
+version: '2.1'
+
+services:
+ database:
+ image: "postgres"
+ hostname: postgres
+ environment:
+ - POSTGRES_DB=saga
+ - POSTGRES_USER=saga
+ - POSTGRES_PASSWORD=password
+ healthcheck:
+ test: ["CMD-SHELL", "nc -z localhost 5432 &> /dev/null; echo $$?"]
+ interval: 30s
+ timeout: 10s
+ retries: 5
+
+ alpha:
+ image: "alpha-server:${TAG}"
+ hostname: alpha-server
+ links:
+ - "database:postgresql.servicecomb.io"
+ - "grafana:grafana.servicecomb.io"
+ environment:
+ - JAVA_OPTS=-javaagent:/maven/saga/aspectjweaver.jar -Dspring.profiles.active=prd -Dkamon.statsd.hostname=grafana.servicecomb.io -Dkamon.statsd.port=8125 -Dkamon.modules.kamon-annotation.auto-start=yes -Dkamon.modules.kamon-log-reporter.auto-start=yes -Dkamon.modules.kamon-statsd.auto-start=yes
+ healthcheck:
+ test: ["CMD-SHELL", "nc -z localhost 8080 &> /dev/null; echo $$?"]
+ interval: 30s
+ timeout: 10s
+ retries: 5
+ depends_on:
+ database:
+ condition: service_healthy
+
+ grafana:
+ image: "kamon/grafana_graphite"
+ hostname: grafana
+ healthcheck:
+ test: ["CMD-SHELL", "nc -z localhost 80 &> /dev/null; echo $$?"]
+ interval: 30s
+ timeout: 10s
+ retries: 5
diff --git a/saga-demo/saga-spring-demo/saga-demo.sh b/saga-demo/saga-spring-demo/saga-demo.sh
index 2b3cf47..b89cd72 100755
--- a/saga-demo/saga-spring-demo/saga-demo.sh
+++ b/saga-demo/saga-spring-demo/saga-demo.sh
@@ -45,6 +45,13 @@ case $1 in
exit $?
;;
+ up-alpha-perf)
+ fetch_version
+ echo "Starting ${service}:${version}"
+ TAG=$version docker-compose -f docker-compose-alpha.yaml up
+ exit $?
+ ;;
+
up-demo)
fetch_version
echo "Starting ${service}:${version}"
[incubator-servicecomb-saga] 02/02: SCB-868 polish the sh script
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git
commit 97129694f3edf39e298156a3a8925785be131b53
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Thu Aug 30 18:49:28 2018 +0800
SCB-868 polish the sh script
---
saga-demo/saga-spring-demo/docker-compose-alpha-perf.yaml | 6 +++++-
saga-demo/saga-spring-demo/saga-demo.sh | 7 +++----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/saga-demo/saga-spring-demo/docker-compose-alpha-perf.yaml b/saga-demo/saga-spring-demo/docker-compose-alpha-perf.yaml
index c0ab950..e6b1d95 100644
--- a/saga-demo/saga-spring-demo/docker-compose-alpha-perf.yaml
+++ b/saga-demo/saga-spring-demo/docker-compose-alpha-perf.yaml
@@ -14,6 +14,8 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
+##-Dkamon.modules.kamon-log-reporter.auto-start=yes -Dkamon.modules.kamon-statsd.auto-start=yes
+##-Dkamon.modules.kamon-annotation.auto-start=yes
version: '2.1'
@@ -38,7 +40,7 @@ services:
- "database:postgresql.servicecomb.io"
- "grafana:grafana.servicecomb.io"
environment:
- - JAVA_OPTS=-javaagent:/maven/saga/aspectjweaver.jar -Dspring.profiles.active=prd -Dkamon.statsd.hostname=grafana.servicecomb.io -Dkamon.statsd.port=8125 -Dkamon.modules.kamon-annotation.auto-start=yes -Dkamon.modules.kamon-log-reporter.auto-start=yes -Dkamon.modules.kamon-statsd.auto-start=yes
+ - JAVA_OPTS=-javaagent:/maven/saga/aspectjweaver.jar -Dspring.profiles.active=prd -Dkamon.statsd.hostname=grafana.servicecomb.io -Dkamon.statsd.port=8125 -Dkamon.modules.kamon-annotation.auto-start=yes -Dkamon.modules.kamon-log-reporter.auto-start=yes -Dkamon.modules.kamon-statsd.auto-start=yes
healthcheck:
test: ["CMD-SHELL", "nc -z localhost 8080 &> /dev/null; echo $$?"]
interval: 30s
@@ -51,6 +53,8 @@ services:
grafana:
image: "kamon/grafana_graphite"
hostname: grafana
+ ports:
+ - "9081:80"
healthcheck:
test: ["CMD-SHELL", "nc -z localhost 80 &> /dev/null; echo $$?"]
interval: 30s
diff --git a/saga-demo/saga-spring-demo/saga-demo.sh b/saga-demo/saga-spring-demo/saga-demo.sh
index b89cd72..569a11b 100755
--- a/saga-demo/saga-spring-demo/saga-demo.sh
+++ b/saga-demo/saga-spring-demo/saga-demo.sh
@@ -48,7 +48,7 @@ case $1 in
up-alpha-perf)
fetch_version
echo "Starting ${service}:${version}"
- TAG=$version docker-compose -f docker-compose-alpha.yaml up
+ TAG=$version docker-compose -f docker-compose-alpha-perf.yaml up
exit $?
;;
@@ -65,17 +65,16 @@ case $1 in
TAG=$version docker-compose -f docker-compose.yaml -f docker-compose.mysql.yaml up
exit $?
;;
-
+
down)
fetch_version
echo "Stopping ${service}:${version}"
TAG=$version docker-compose down
exit $?
;;
-
+
*)
show_usage
exit 2
;;
esac
-