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 2020/01/15 04:18:21 UTC
[servicecomb-pack] branch master updated: SCB-1724 Update
upgrade-guide & state-diagram documents for SCB-1696
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/servicecomb-pack.git
The following commit(s) were added to refs/heads/master by this push:
new d2b8434 SCB-1724 Update upgrade-guide & state-diagram documents for SCB-1696
d2b8434 is described below
commit d2b843433dc316f2532e334b7bcf1a521ee3a6b8
Author: Lei Zhang <zh...@apache.org>
AuthorDate: Tue Jan 14 20:10:09 2020 +0800
SCB-1724 Update upgrade-guide & state-diagram documents for SCB-1696
---
docs/fsm/plantuml/saga-state-diagram.puml | 4 ++--
docs/upgrade_guide/0.6.0-upgrade-guide.md | 15 +++++++++++++--
docs/upgrade_guide/0.6.0-upgrade-guide_zh.md | 16 ++++++++++++++--
3 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/docs/fsm/plantuml/saga-state-diagram.puml b/docs/fsm/plantuml/saga-state-diagram.puml
index b9233c5..35cf83e 100644
--- a/docs/fsm/plantuml/saga-state-diagram.puml
+++ b/docs/fsm/plantuml/saga-state-diagram.puml
@@ -33,7 +33,7 @@ FAILED --> COMPENSATED : SagaAbortedEvent<font color=red>:doCompensation</font>
FAILED --> SUSPENDED : SagaTimeoutEvent
-FAILED --> FAILED : TxComponsitedEvent<font color=blue>:UpdateTxEntity</font>\nTxStartedEvent<font color=blue>:AddTxEntity</font>\nTxEndedEvent<font color=red>:doCompensation</font>\nTxComponsitedCheckInternalEvent
+FAILED --> FAILED : TxCompensateAckSucceedEvent<font color=blue>:UpdateTxEntity</font>\nTxCompensateAckFailedEvent<font color=blue>:UpdateTxEntity</font>\nTxStartedEvent<font color=blue>:AddTxEntity</font>\nTxEndedEvent<font color=red>:doCompensation</font>\nComponsitedCheckEvent
COMPENSATED --> [*]
@@ -49,4 +49,4 @@ COMMITTED: Map<localTxId,TxEntity> txEntityMap
COMPENSATED: Map<localTxId,TxEntity> txEntityMap
SUSPENDED: Map<localTxId,TxEntity> txEntityMap
-@enduml
+@enduml
\ No newline at end of file
diff --git a/docs/upgrade_guide/0.6.0-upgrade-guide.md b/docs/upgrade_guide/0.6.0-upgrade-guide.md
index 0b1afd1..5ea5a0d 100644
--- a/docs/upgrade_guide/0.6.0-upgrade-guide.md
+++ b/docs/upgrade_guide/0.6.0-upgrade-guide.md
@@ -4,7 +4,18 @@ This document is meant to help you migrate your application to Pack 0.6.0 by pro
## Omega Components
-Rename @Compensable annotation property `retries` to `forwardRetries`
+Rename @Compensable property `retries` to `forwardRetries` default 0
-Rename @Compensable annotation property `timeout` to `forwardTimeout`
+@Compensable add property `forwardTimeout` default 0
+@Compensable add property `reverseRetries` default 0
+
+@Compensable add property `reverseTimeout` default 0
+
+@Compensable add property `retryDelayInMilliseconds` default 0
+
+## gRPC protocol
+
+Message GrpcTxEvent rename property `retries` to `forwardRetries`
+
+Message GrpcTxEvent add properties `forwardTimeout` `reverseRetries` `reverseTimeout` `retryDelayInMilliseconds`
\ No newline at end of file
diff --git a/docs/upgrade_guide/0.6.0-upgrade-guide_zh.md b/docs/upgrade_guide/0.6.0-upgrade-guide_zh.md
index 4d0ad7d..ae57251 100644
--- a/docs/upgrade_guide/0.6.0-upgrade-guide_zh.md
+++ b/docs/upgrade_guide/0.6.0-upgrade-guide_zh.md
@@ -4,7 +4,19 @@
## Omega 组件
-@Compensable 注解的 `retries` 属性改名为 `forwardRetries`
+@Compensable 注解的 `retries` 属性改名为 `forwardRetries` 默认值 0
-@Compensable 注解的 `timeout` 属性改名为 `forwardTimeout`
+@Compensable 注解增加属性 `forwardTimeout` 默认值 0
+@Compensable 注解增加属性 `reverseRetries` 默认值 0
+
+@Compensable 注解增加属性 `reverseTimeout` 默认值 0
+
+@Compensable 注解增加属性 `retryDelayInMilliseconds` 默认值 0
+
+
+## gRPC protocol
+
+Message GrpcTxEvent 属性 `retries` 改名为 `forwardRetries`
+
+Message GrpcTxEvent 增加属性 `forwardTimeout` `reverseRetries` `reverseTimeout` `retryDelayInMilliseconds`
\ No newline at end of file