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 2019/01/12 00:35:33 UTC

[servicecomb-pack] branch 0.3.x updated (da5c889 -> 9b98d07)

This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a change to branch 0.3.x
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git.


    from da5c889  Updated the project version for next developement
     new e48e92e  Try to fix the random failure of travis CI
     new 9b98d07  SCB-1111 fixed the demo starting error

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:
 alpha/alpha-server/src/main/resources/application.yaml      | 13 ++++++++-----
 .../apache/servicecomb/pack/demo/car/CarBookingService.java |  6 ++++++
 2 files changed, 14 insertions(+), 5 deletions(-)


[servicecomb-pack] 02/02: SCB-1111 fixed the demo starting error

Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch 0.3.x
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git

commit 9b98d078aee365c958bc083f8a0e484ce3ab243e
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Sat Jan 12 07:24:22 2019 +0800

    SCB-1111 fixed the demo starting error
---
 alpha/alpha-server/src/main/resources/application.yaml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/alpha/alpha-server/src/main/resources/application.yaml b/alpha/alpha-server/src/main/resources/application.yaml
index b8cd118..7efd6de 100644
--- a/alpha/alpha-server/src/main/resources/application.yaml
+++ b/alpha/alpha-server/src/main/resources/application.yaml
@@ -22,6 +22,13 @@ alpha:
     host: 0.0.0.0
     port: 8080
 
+# EclipseLink will attempt to create tables. If the table exists, EclipseLink will add any missing columns.
+spring:
+  jpa:
+    properties:
+      eclipselink:
+        ddl-generation: create-or-extend-tables
+
 ---
 spring:
   profiles: ssl
@@ -42,7 +49,7 @@ spring:
     password: password
     url: jdbc:postgresql://postgresql.servicecomb.io:5432/saga?useSSL=false
     platform: postgresql
-#    continue-on-error: true
+    continue-on-error: true
 
 ---
 spring:
@@ -53,7 +60,3 @@ spring:
     url: jdbc:mysql://mysql.servicecomb.io:3306/saga?useSSL=false
     platform: mysql
     continue-on-error: true
-  jpa:
-    properties:
-      eclipselink:
-        ddl-generation: none


[servicecomb-pack] 01/02: Try to fix the random failure of travis CI

Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch 0.3.x
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git

commit e48e92ed2c7b19d698f92a65a66fa0a4b1e1443b
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Fri Jan 11 15:34:44 2019 +0800

    Try to fix the random failure of travis CI
---
 .../org/apache/servicecomb/pack/demo/car/CarBookingService.java     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/pack/demo/car/CarBookingService.java b/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/pack/demo/car/CarBookingService.java
index a0a6c31..9a4076b 100644
--- a/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/pack/demo/car/CarBookingService.java
+++ b/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/pack/demo/car/CarBookingService.java
@@ -40,6 +40,12 @@ class CarBookingService {
     if (bookings.containsKey(id)) {
       bookings.get(id).cancel();
     }
+    // Just sleep a while to ensure the Compensated event is after ordering TxAbort event
+    try {
+      Thread.sleep(1000);
+    } catch (InterruptedException e) {
+      // Just ignore the exception
+    }
   }
 
   Collection<CarBooking> getAllBookings() {