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/10 06:34:24 UTC

[incubator-servicecomb-saga] branch master updated: Polish the user guide document

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


The following commit(s) were added to refs/heads/master by this push:
     new 0d1ecf6  Polish the user guide document
0d1ecf6 is described below

commit 0d1ecf601bbfd0458b234a3d0b86d86af37d32e3
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Fri Aug 10 14:34:09 2018 +0800

    Polish the user guide document
---
 docs/user_guide.md    | 3 +++
 docs/user_guide_zh.md | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/user_guide.md b/docs/user_guide.md
index 58a2b2b..293004b 100644
--- a/docs/user_guide.md
+++ b/docs/user_guide.md
@@ -96,11 +96,14 @@ Take a transfer money application as an example:
 
 4. Repeat step 3 for the `transferIn` service.
 
+5. Since Saga-0.3.0,  you can access the [OmegaContext](https://github.com/apache/incubator-servicecomb-saga/blob/master/omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/OmegaContext.java) for the gloableTxId and localTxId in the @Compensable annotated method or the cancel method.
+
 ## How to run
 1. run postgreSQL.
    ```bash
    docker run -d -e "POSTGRES_DB=saga" -e "POSTGRES_USER=saga" -e "POSTGRES_PASSWORD=password" -p 5432:5432 postgres
    ```
+   Please check out [this document](https://github.com/apache/incubator-servicecomb-saga/blob/master/docs/faq/en/how_to_use_mysql_as_alpha_backend_database.md), if you want to use the MySQL instead of postgreSQL.
 
 2. run alpha. Before running alpha, please make sure postgreSQL is already up. You can run alpha through docker or executable file.
    * Run alpha through docker.
diff --git a/docs/user_guide_zh.md b/docs/user_guide_zh.md
index 4331001..5e156a9 100644
--- a/docs/user_guide_zh.md
+++ b/docs/user_guide_zh.md
@@ -96,11 +96,16 @@ Saga可通过以下任一方式进行构建:
 
 4. 对转入服务重复第三步即可。
 
+5. 从Saga-0.3.0, 你可以在服务函数或者取消函数中通过访问 [OmegaContext](https://github.com/apache/incubator-servicecomb-saga/blob/master/omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/OmegaContext.java) 来获取 gloableTxId 以及 localTxId 信息。
+
+
 ## 如何运行
-1. 运行postgreSQL
+1. 运行postgreSQL,
    ```bash
    docker run -d -e "POSTGRES_DB=saga" -e "POSTGRES_USER=saga" -e "POSTGRES_PASSWORD=password" -p 5432:5432 postgres
    ```
+   如果你想使用MySQL做为后台数据库,可以参考 [此文档](https://github.com/apache/incubator-servicecomb-saga/blob/master/docs/faq/en/how_to_use_mysql_as_alpha_backend_database.md)。
+
 
 2. 运行alpha。在运行alpha前,请确保postgreSQL已正常启动。可通过docker或可执行文件的方式来启动alpha。
    * 通过docker运行: