[SCB-244] enable servicecomb and add demo by zhengyangyong · Pull Request #210 · apache/servicecomb-pack

zhengyangyong · 2018-06-20T10:44:23Z

Follow this checklist to help us incorporate your contribution quickly and easily:

Make sure there is a JIRA issue filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes.
Each commit in the pull request should have a meaningful subject line and body.
Format the pull request title like [SCB-XXX] Fixes bug in ApproximateQuantiles, where you replace SCB-XXX with the appropriate JIRA issue.
Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
Run mvn clean install to make sure basic checks pass. A more thorough check will be performed on your pull request automatically.
If this contribution is large, please file an Apache Individual Contributor License Agreement.

Signed-off-by: zhengyangyong <yangyong.zheng@huawei.com>

coveralls · 2018-06-20T10:51:33Z

Coverage decreased (-0.8%) to 94.161% when pulling be0e7d0 on zhengyangyong:SCB-244 into d24cb61 on apache:master.

coveralls · 2018-06-20T10:51:33Z

Coverage decreased (-1.7%) to 93.194% when pulling 5a51819 on zhengyangyong:SCB-244 into d24cb61 on apache:master.

zhengyangyong · 2018-06-20T11:00:29Z

This pr need java chassis 1.0.0-m2

WillemJiang

Please update the accept test with this demo at the same time.

WillemJiang · 2018-06-20T13:23:42Z

omega/omega-transport/omega-transport-servicecomb/pom.xml

  <artifactId>omega-transport-servicecomb</artifactId>

+  <properties>
+    <java-chassis.version>1.0.0-m2</java-chassis.version>


Java chassis version is used in the root pom, we don't need to define it here.

WillemJiang · 2018-06-20T13:26:28Z

...c/main/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaConsumerHandler.java

+    try {
+      omegaContext = BeanUtils.getBean("omegaContext");
+    } catch (NullPointerException npe) {
+      LOG.warn("The OmegaContext is not injected, The SagaConsumerHandler is disabled.");


The warning message need to updated.
SagaConsumerHandler is not disabled, it's just cannot inject transaction ID.

WillemJiang · 2018-06-20T13:26:37Z

...c/main/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaConsumerHandler.java

          LOCAL_TX_ID_KEY,
          omegaContext.localTxId());
+    } else {
+      LOG.warn("The OmegaContext is not injected, The SagaConsumerHandler is disabled.");


The SagaConsumerHandler just skip the work, the log level can be info.

WillemJiang · 2018-06-20T13:27:47Z

...c/main/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaProviderHandler.java

        omegaContext.setLocalTxId(invocation.getContext().get(LOCAL_TX_ID_KEY));
      }
+    } else {
+      LOG.warn("The OmegaContext is not injected, The SagaConsumerHandler is disabled.");


The warning need to be updated.

WillemJiang · 2018-06-20T13:29:36Z

...c/main/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaProviderHandler.java

-    this.omegaContext = omegaContext;
-    if (omegaContext == null) {
-      LOG.info("The OmegaContext is not injected, The SagaProviderHander is disabled.");
+  private OmegaContext omegaContext;


It's better to use the final object to avoid the change from outside.
We could add a new construction method which set the omegaContext to be null.

WillemJiang · 2018-06-20T13:31:28Z

...st/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaConsumerHandlerTest.java

  private final AsyncResponse asyncResponse = mock(AsyncResponse.class);

-  private final SagaConsumerHandler handler = new SagaConsumerHandler(omegaContext);
+  private final SagaConsumerHandler handler = new SagaConsumerHandler();


Please keep the old code.

WillemJiang · 2018-06-20T13:36:23Z

saga-demo/saga-servicecomb-demo/pom.xml

+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <saga.version>0.3.0-SNAPSHOT</saga.version>
+    <java-chassis.version>1.0.0-m2</java-chassis.version>


we should inherited the version from root pom.xml

WillemJiang · 2018-06-20T13:40:32Z

As the java-chassis 1.0.0-m2 is not released yet, you may need to use 1.0.0-m1 to get the CI passed.

Signed-off-by: zhengyangyong <yangyong.zheng@huawei.com>

WillemJiang · 2018-06-22T10:19:26Z

...c/main/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaConsumerHandler.java

+      context = BeanUtils.getBean("omegaContext");
    } catch (NullPointerException npe) {
-      LOG.warn("The OmegaContext is not injected, The SagaConsumerHandler is disabled.");
+      LOG.warn("SagaConsumerHandler is not disabled, it's just cannot inject transaction ID.");


The waring message should be "The OmegaContext is null, SagaConsumer cannot inject transaction ID"

zhengyangyong added 6 commits June 19, 2018 16:56

SCB-244 fix servicecomb handler

c19e703

Signed-off-by: zhengyangyong <yangyong.zheng@huawei.com>

SCB-244 add servicecomb demo

30fc3c3

Signed-off-by: zhengyangyong <yangyong.zheng@huawei.com>

SCB-244 for docker compose

9a2e5d6

Signed-off-by: zhengyangyong <yangyong.zheng@huawei.com>

SCB-244 fix scope and package

23031ca

Signed-off-by: zhengyangyong <yangyong.zheng@huawei.com>

SCB-244 fix docker compose yaml

c323231

Signed-off-by: zhengyangyong <yangyong.zheng@huawei.com>

SCB-244 add readme and add warn log in handler

be0e7d0

Signed-off-by: zhengyangyong <yangyong.zheng@huawei.com>

zhengyangyong requested review from WillemJiang and eric-lee-ltk June 20, 2018 10:44

WillemJiang suggested changes Jun 20, 2018

View reviewed changes

SCB-244 fix pr comment

5a51819

Signed-off-by: zhengyangyong <yangyong.zheng@huawei.com>

WillemJiang reviewed Jun 22, 2018

View reviewed changes

WillemJiang approved these changes Jun 26, 2018

View reviewed changes

WillemJiang merged commit b450957 into apache:master Jun 26, 2018

Conversation

zhengyangyong commented Jun 20, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

coveralls commented Jun 20, 2018

Uh oh!

coveralls commented Jun 20, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

zhengyangyong commented Jun 20, 2018

Uh oh!

WillemJiang left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

WillemJiang commented Jun 20, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

zhengyangyong commented Jun 20, 2018 •

edited

Loading

coveralls commented Jun 20, 2018 •

edited

Loading