[incubator-servicecomb-saga] 10/13: SCB-212 attempted to fix random test failure by resetting latency before test

[se...@apache.org]

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

seanyinx pushed a commit to branch SCB-212_tx_timeout
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git

commit 6113c667f2b4081fa0b6d38902330c134c2e51c7
Author: seanyinx <se...@huawei.com>
AuthorDate: Thu Jan 11 14:14:59 2018 +0800

    SCB-212 attempted to fix random test failure by resetting latency before test
    
    Signed-off-by: seanyinx <se...@huawei.com>
---
 .../saga/omega/connector/grpc/LoadBalancedClusterMessageSender.java    | 2 ++
 .../omega/connector/grpc/LoadBalancedClusterMessageSenderTest.java     | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSender.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSender.java
index 3cb6677..d441040 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSender.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSender.java
@@ -99,6 +99,7 @@ public class LoadBalancedClusterMessageSender implements MessageSender {
     senders.keySet().forEach(sender -> {
       try {
         sender.onConnected();
+        senders.put(sender, 0L);
       } catch (Exception e) {
         log.error("Failed connecting to alpha at {}", sender.target(), e);
       }
@@ -110,6 +111,7 @@ public class LoadBalancedClusterMessageSender implements MessageSender {
     senders.keySet().forEach(sender -> {
       try {
         sender.onDisconnected();
+        senders.put(sender, Long.MAX_VALUE);
       } catch (Exception e) {
         log.error("Failed disconnecting from alpha at {}", sender.target(), e);
       }
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSenderTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSenderTest.java
index f995002..24326e3 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSenderTest.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSenderTest.java
@@ -242,6 +242,7 @@ public class LoadBalancedClusterMessageSenderTest {
 
   @Test
   public void considerFasterServerFirst() throws Exception {
+    messageSender.onConnected();
     // we don't know which server is selected at first
     messageSender.send(event);
 
@@ -250,7 +251,7 @@ public class LoadBalancedClusterMessageSenderTest {
     messageSender.send(event);
     messageSender.send(event);
 
-    await().atMost(1, SECONDS).until(() -> eventsMap.get(8080).size() == 3);
+    assertThat(eventsMap.get(8080).size(), is(3));
     assertThat(eventsMap.get(8090).size(), is(1));
   }
 

-- 
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.