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/08/14 14:34:39 UTC
[servicecomb-website] branch asf-site updated (9a67a3a -> a72544b)
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git.
from 9a67a3a Publish the website
add 00515d6 Edit mersher quick start.
new e246dd9 Merge branch 'master' into asf-site
new a72544b Publish website
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:
_docs/cn/mersher-distributed-tracing.md | 10 +-
_docs/cn/mersher-flow-control.md | 4 +-
_docs/cn/mersher-load-balance.md | 29 ++++-
_docs/cn/mersher-quick-start.md | 114 +++++++++---------
_docs/cn/mersher-service-management.md | 32 +++---
_docs/mersher-distributed-tracing.md | 10 +-
_docs/mersher-flow-control.md | 4 +-
_docs/mersher-load-balance.md | 25 +++-
_docs/mersher-quick-start.md | 112 ++++++++----------
_docs/mersher-service-management.md | 36 +++---
.../mersher/mersher-circuitbreaker-ret-nil.png | Bin 0 -> 7302 bytes
.../images/mersher/mersher-circuitbreaker-ret.png | Bin 5972 -> 9028 bytes
assets/images/mersher/mersher-circuitbreaker.png | Bin 15220 -> 30583 bytes
.../images/mersher/mersher-deployment-simple.png | Bin 0 -> 51664 bytes
.../images/mersher/mersher-flow-control-fail.png | Bin 26430 -> 6958 bytes
assets/images/mersher/mersher-flowchart-simple.png | Bin 0 -> 23925 bytes
assets/images/mersher/mersher-ser-manage-ver.png | Bin 5934 -> 16442 bytes
assets/images/mersher/mersher-servercenter.png | Bin 31799 -> 28075 bytes
assets/images/mersher/mersher-testinit.png | Bin 29517 -> 30550 bytes
assets/images/mersher/mersher-testpythonhttp2.png | Bin 0 -> 31215 bytes
assets/images/mersher/mersher-tracing-30111.png | Bin 42725 -> 48084 bytes
.../mersher/mersher-circuitbreaker-ret-nil.png | Bin 0 -> 7302 bytes
.../images/mersher/mersher-circuitbreaker-ret.png | Bin 5972 -> 9028 bytes
.../images/mersher/mersher-circuitbreaker.png | Bin 15220 -> 30583 bytes
.../images/mersher/mersher-deployment-simple.png | Bin 0 -> 51664 bytes
.../images/mersher/mersher-flow-control-fail.png | Bin 26430 -> 6958 bytes
.../images/mersher/mersher-flowchart-simple.png | Bin 0 -> 23925 bytes
.../images/mersher/mersher-ser-manage-ver.png | Bin 5934 -> 16442 bytes
.../assets/images/mersher/mersher-servercenter.png | Bin 31799 -> 28075 bytes
content/assets/images/mersher/mersher-testinit.png | Bin 29517 -> 30550 bytes
.../images/mersher/mersher-testpythonhttp2.png | Bin 0 -> 31215 bytes
.../images/mersher/mersher-tracing-30111.png | Bin 42725 -> 48084 bytes
.../mersher-distributed-tracing/index.html | 10 +-
.../mersher-flow-control/index.html | 4 +-
.../mersher-load-balance/index.html | 32 +++++-
.../mersher-service-management/index.html | 33 +++---
content/cn/docs/mersher-quick-start/index.html | 128 +++++++++++----------
.../mersher-distributed-tracing/index.html | 10 +-
.../mersher-flow-control/index.html | 4 +-
.../mersher-load-balance/index.html | 29 ++++-
.../mersher-service-management/index.html | 37 +++---
content/docs/mersher-quick-start/index.html | 121 +++++++++----------
content/feed.xml | 2 +-
content/sitemap.xml | 2 +-
44 files changed, 425 insertions(+), 363 deletions(-)
create mode 100644 assets/images/mersher/mersher-circuitbreaker-ret-nil.png
create mode 100644 assets/images/mersher/mersher-deployment-simple.png
create mode 100644 assets/images/mersher/mersher-flowchart-simple.png
create mode 100644 assets/images/mersher/mersher-testpythonhttp2.png
create mode 100644 content/assets/images/mersher/mersher-circuitbreaker-ret-nil.png
create mode 100644 content/assets/images/mersher/mersher-deployment-simple.png
create mode 100644 content/assets/images/mersher/mersher-flowchart-simple.png
create mode 100644 content/assets/images/mersher/mersher-testpythonhttp2.png
[servicecomb-website] 02/02: Publish website
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git
commit a72544bec77540d62b993b036322a9024131398b
Author: Willem Jiang <wi...@gmail.com>
AuthorDate: Wed Aug 14 22:34:21 2019 +0800
Publish website
---
.../mersher/mersher-circuitbreaker-ret-nil.png | Bin 0 -> 7302 bytes
.../images/mersher/mersher-circuitbreaker-ret.png | Bin 5972 -> 9028 bytes
.../images/mersher/mersher-circuitbreaker.png | Bin 15220 -> 30583 bytes
.../images/mersher/mersher-deployment-simple.png | Bin 0 -> 51664 bytes
.../images/mersher/mersher-flow-control-fail.png | Bin 26430 -> 6958 bytes
.../images/mersher/mersher-flowchart-simple.png | Bin 0 -> 23925 bytes
.../images/mersher/mersher-ser-manage-ver.png | Bin 5934 -> 16442 bytes
.../assets/images/mersher/mersher-servercenter.png | Bin 31799 -> 28075 bytes
content/assets/images/mersher/mersher-testinit.png | Bin 29517 -> 30550 bytes
.../images/mersher/mersher-testpythonhttp2.png | Bin 0 -> 31215 bytes
.../images/mersher/mersher-tracing-30111.png | Bin 42725 -> 48084 bytes
.../mersher-distributed-tracing/index.html | 10 +-
.../mersher-flow-control/index.html | 4 +-
.../mersher-load-balance/index.html | 32 +++++-
.../mersher-service-management/index.html | 33 +++---
content/cn/docs/mersher-quick-start/index.html | 128 +++++++++++----------
.../mersher-distributed-tracing/index.html | 10 +-
.../mersher-flow-control/index.html | 4 +-
.../mersher-load-balance/index.html | 29 ++++-
.../mersher-service-management/index.html | 37 +++---
content/docs/mersher-quick-start/index.html | 121 +++++++++----------
content/feed.xml | 2 +-
content/sitemap.xml | 2 +-
23 files changed, 227 insertions(+), 185 deletions(-)
diff --git a/content/assets/images/mersher/mersher-circuitbreaker-ret-nil.png b/content/assets/images/mersher/mersher-circuitbreaker-ret-nil.png
new file mode 100644
index 0000000..33bd3cf
Binary files /dev/null and b/content/assets/images/mersher/mersher-circuitbreaker-ret-nil.png differ
diff --git a/content/assets/images/mersher/mersher-circuitbreaker-ret.png b/content/assets/images/mersher/mersher-circuitbreaker-ret.png
index 803de40..5309f72 100644
Binary files a/content/assets/images/mersher/mersher-circuitbreaker-ret.png and b/content/assets/images/mersher/mersher-circuitbreaker-ret.png differ
diff --git a/content/assets/images/mersher/mersher-circuitbreaker.png b/content/assets/images/mersher/mersher-circuitbreaker.png
index 907ae18..2bf3b5a 100644
Binary files a/content/assets/images/mersher/mersher-circuitbreaker.png and b/content/assets/images/mersher/mersher-circuitbreaker.png differ
diff --git a/content/assets/images/mersher/mersher-deployment-simple.png b/content/assets/images/mersher/mersher-deployment-simple.png
new file mode 100644
index 0000000..f65c8f3
Binary files /dev/null and b/content/assets/images/mersher/mersher-deployment-simple.png differ
diff --git a/content/assets/images/mersher/mersher-flow-control-fail.png b/content/assets/images/mersher/mersher-flow-control-fail.png
index bab78f0..6dedb46 100644
Binary files a/content/assets/images/mersher/mersher-flow-control-fail.png and b/content/assets/images/mersher/mersher-flow-control-fail.png differ
diff --git a/content/assets/images/mersher/mersher-flowchart-simple.png b/content/assets/images/mersher/mersher-flowchart-simple.png
new file mode 100644
index 0000000..a9d4549
Binary files /dev/null and b/content/assets/images/mersher/mersher-flowchart-simple.png differ
diff --git a/content/assets/images/mersher/mersher-ser-manage-ver.png b/content/assets/images/mersher/mersher-ser-manage-ver.png
index c65ee50..2348a34 100644
Binary files a/content/assets/images/mersher/mersher-ser-manage-ver.png and b/content/assets/images/mersher/mersher-ser-manage-ver.png differ
diff --git a/content/assets/images/mersher/mersher-servercenter.png b/content/assets/images/mersher/mersher-servercenter.png
index 5279def..ef14561 100644
Binary files a/content/assets/images/mersher/mersher-servercenter.png and b/content/assets/images/mersher/mersher-servercenter.png differ
diff --git a/content/assets/images/mersher/mersher-testinit.png b/content/assets/images/mersher/mersher-testinit.png
index 2ed1b64..cc5c861 100644
Binary files a/content/assets/images/mersher/mersher-testinit.png and b/content/assets/images/mersher/mersher-testinit.png differ
diff --git a/content/assets/images/mersher/mersher-testpythonhttp2.png b/content/assets/images/mersher/mersher-testpythonhttp2.png
new file mode 100644
index 0000000..a8a0fd1
Binary files /dev/null and b/content/assets/images/mersher/mersher-testpythonhttp2.png differ
diff --git a/content/assets/images/mersher/mersher-tracing-30111.png b/content/assets/images/mersher/mersher-tracing-30111.png
index 4eb5c5a..658ecfd 100644
Binary files a/content/assets/images/mersher/mersher-tracing-30111.png and b/content/assets/images/mersher/mersher-tracing-30111.png differ
diff --git a/content/cn/docs/mersher-quick-start-advance/mersher-distributed-tracing/index.html b/content/cn/docs/mersher-quick-start-advance/mersher-distributed-tracing/index.html
index e696c3b..f14450d 100644
--- a/content/cn/docs/mersher-quick-start-advance/mersher-distributed-tracing/index.html
+++ b/content/cn/docs/mersher-quick-start-advance/mersher-distributed-tracing/index.html
@@ -443,18 +443,20 @@
<p><img src="/assets/images/mersher/mersher-tracing-func.png" alt="流量控制效果图" /></p>
</li>
<li>
- <p>3、重新编译，分别替换<strong>mersher-g</strong>、<strong>mersher-a</strong>和<strong>mersher-b</strong>的可执行文件，启动mersher服务；</p>
+ <p>3、重新编译，分别替换<strong>mersher_webapp</strong>和<strong>mersher_calculator</strong>的可执行文件，启动mersher服务；</p>
</li>
<li>
<p>4、使用<strong>Docker</strong>运行<a href="http://servicecomb.apache.org/cn/docs/quick-start-advance/distributed-tracing/">Zipkin分布式追踪服务</a></p>
+
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>docker run -d -p 9411:9411 openzipkin/zipkin
+</code></pre>
+ </div>
</li>
<li>
<p>5、多次点击 <em>Submit</em> 按钮发起服务调用；</p>
</li>
<li>
- <p>6、打开 <a href="http://192.168.88.64:9411">http://192.168.88.64:9411</a>可查看分布式追踪结果如图，可以通过host地址看到分别调用了<strong>mersher-a</strong>(监听30108端口)和<strong>mersher-b</strong>（监听30111端口）：</p>
-
- <p><img src="/assets/images/mersher/mersher-tracing-30108.png" alt="分布式追踪效果图" /><br /></p>
+ <p>6、打开 <a href="http://192.168.88.64:9411">http://192.168.88.64:9411</a>可查看分布式追踪结果如图，可以通过host地址判断调用路径：</p>
<p><img src="/assets/images/mersher/mersher-tracing-30111.png" alt="分布式追踪效果图" /></p>
</li>
diff --git a/content/cn/docs/mersher-quick-start-advance/mersher-flow-control/index.html b/content/cn/docs/mersher-quick-start-advance/mersher-flow-control/index.html
index a3e5258..f9436ef 100644
--- a/content/cn/docs/mersher-quick-start-advance/mersher-flow-control/index.html
+++ b/content/cn/docs/mersher-quick-start-advance/mersher-flow-control/index.html
@@ -431,7 +431,7 @@
<ul>
<li>
- <p>添加流量控制配置，重启服务，更改<strong>mersher-a</strong>配置文件<strong>chassis.yaml</strong>，其中流量控制包含下列选项：</p>
+ <p>添加流量控制配置，重启服务，更改<strong>mersher_calculator</strong>配置文件<strong>chassis.yaml</strong>，其中流量控制包含下列选项：</p>
<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">flowcontrol</span><span class="pi">:</span>
<span class="s">Provider</span><span class="pi">:</span>
@@ -452,7 +452,7 @@
<ul>
<li>
- <p>点击 <em>Submit</em> 按钮，此时能看到由于流控受限而请求被拒的界面，请求已经无法到达httpserver。</p>
+ <p>点击 <em>Submit</em> 按钮，此时能看到由于流控受限而请求被拒的界面，请求已经无法到达httpserver_calculator。</p>
<p><img src="/assets/images/mersher/mersher-flow-control-fail.png" alt="流量控制效果图" /></p>
diff --git a/content/cn/docs/mersher-quick-start-advance/mersher-load-balance/index.html b/content/cn/docs/mersher-quick-start-advance/mersher-load-balance/index.html
index d9d88f2..8a81631 100644
--- a/content/cn/docs/mersher-quick-start-advance/mersher-load-balance/index.html
+++ b/content/cn/docs/mersher-quick-start-advance/mersher-load-balance/index.html
@@ -403,7 +403,7 @@
<meta itemprop="headline" content="负载均衡">
<meta itemprop="description" content="介绍如何在体质指数应用中使用mersher提供的负载均衡能力">
- <meta itemprop="dateModified" content="September 03, 2017">
+ <meta itemprop="dateModified" content="August 08, 2019">
<div class="page__inner-wrap">
@@ -430,8 +430,27 @@
<h1 id="负载均衡算法">负载均衡算法</h1>
<ul>
+ <li>启动一个新的<strong>mersher_calculator</strong>和<strong>httpserver_calculator</strong>实例用于负载均衡测试，可以使用例子目录<a href="https://github.com/apache/servicecomb-mesher/tree/master/examples/quick_start/test_balance">test_balance</a>下的服务：</li>
<li>
- <p>1、默认情况下会使用roundbin（轮询）负载均衡算法，另外还支持Random和SessionStickiness负载均衡算法。 我们将负载均衡方法配置为Random，修改mersher-g的配置文件chassis.yaml：</p>
+ <p>1、修改mersher_calculator配置文件<strong>microservice.yaml</strong>中的服务name为<strong>calculator</strong>；<br />
+更改配置<strong>chassis.yaml</strong>监听的地址和端口避免冲突：</p>
+
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>listenAddress: 127.0.0.1:40101 -----》 listenAddress: 192.168.88.64:40102
+listenAddress: 127.0.0.1:30101 -----》 listenAddress: 192.168.88.64:30108
+listenAddress: 127.0.0.1:30102 -----》 listenAddress: 192.168.88.64:30109
+</code></pre>
+ </div>
+ </li>
+ <li>
+ <p>2、 启动<strong>mersher_calculator</strong>，需要设置mersher_calculator的<strong>SPECIFIC_ADDR</strong>地址，该地址用于将mersher和http服务绑定起来；</p>
+
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code> <span class="nb">export </span><span class="nv">SPECIFIC_ADDR</span><span class="o">=</span>127.0.0.1:4537
+ ./mersher
+</code></pre>
+ </div>
+ </li>
+ <li>
+ <p>3、 默认情况下会使用roundbin（轮询）负载均衡算法，另外还支持Random和SessionStickiness负载均衡算法。 我们修改mersher_webapp的配置文件chassis.yaml，将负载均衡方法配置为Random：</p>
<div class="language-bash highlighter-rouge"><pre class="highlight"><code>loadbalance:
strategy:
@@ -440,11 +459,14 @@
</div>
</li>
<li>
- <p>2、此时点击 <em>Submit</em> 按钮就可以看到如下两个界面中的BMI Instance ID随机出现。</p>
+ <p>4、 开启httpserver_calculator服务新实例，监听4537端口；</p>
+ </li>
+ <li>
+ <p>5、 此时点击 <em>Submit</em> 按钮就可以看到如下两个界面中的BMI Instance ID随机出现。</p>
- <p><img src="/assets/images/mersher/mersher-testgohttp.png" alt="bmi测试初始化图" /><br /></p>
+ <p><img src="/assets/images/mersher/mersher-testpythonhttp.png" alt="bmi测试初始化图1" /><br /></p>
- <p><img src="/assets/images/mersher/mersher-testpythonhttp.png" alt="bmi测试初始化图" /></p>
+ <p><img src="/assets/images/mersher/mersher-testpythonhttp2.png" alt="bmi测试初始化图2" /></p>
</li>
</ul>
diff --git a/content/cn/docs/mersher-quick-start-advance/mersher-service-management/index.html b/content/cn/docs/mersher-quick-start-advance/mersher-service-management/index.html
index 7d54fb6..ba30961 100644
--- a/content/cn/docs/mersher-quick-start-advance/mersher-service-management/index.html
+++ b/content/cn/docs/mersher-quick-start-advance/mersher-service-management/index.html
@@ -424,7 +424,7 @@
<h1 id="前言">前言</h1>
<ul>
- <li>在您进一步阅读之前，请确保您已阅读了<a href="/cn/docs/mersher-quick-start/">mersher快速入门</a>，并已成功运行mersher用例服务。</li>
+ <li>在您进一步阅读之前，请确保您已阅读了<a href="/cn/docs/mersher-quick-start/">mersher快速入门</a>和<a href="/cn/docs/quick-start-advance/load-balance/">mersher负载均衡</a>，并已成功运行mersher用例服务。</li>
</ul>
<h1 id="灰度发布">灰度发布</h1>
@@ -433,23 +433,23 @@
<ul>
<li>
- <p>1、更新版本号： 分别更改<strong>mersher-a</strong>和<strong>mersher-b</strong>的配置文件<strong>microservice.yaml</strong>，更新<strong>version</strong>字段分别为<strong>1.1.1</strong>和<strong>1.1.2</strong>，重启mersher服务，可以看到服务版本号发生了变更。如图中所示：</p>
+ <p>1、更新版本号： 分别更改两个<strong>mersher_calculator</strong>实例的配置文件<strong>microservice.yaml</strong>，更新<strong>version</strong>字段分别为<strong>1.1.1</strong>和<strong>1.1.2</strong>，重启mersher服务，可以看到服务版本号发生了变更。如图中所示：</p>
<p><img src="/assets/images/mersher/mersher-ser-manage-ver.png" alt="灰度发布版本图" /></p>
</li>
<li>
- <p>2、配置路由信息，更改mersher-g的配置文件router.yaml，按实例版本更新权重信息，并重启服务：</p>
+ <p>2、配置路由信息，更改mersher_webapp的配置文件router.yaml，按实例版本更新权重信息，并重启服务：</p>
<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">routeRule</span><span class="pi">:</span>
-<span class="s">mersher-provider</span><span class="pi">:</span> <span class="c1">#service name</span>
-<span class="pi">-</span> <span class="s">precedence</span><span class="pi">:</span> <span class="s">2</span> <span class="c1">#precedence of route rule</span>
- <span class="s">route</span><span class="pi">:</span> <span class="c1">#route rule list</span>
- <span class="pi">-</span> <span class="s">tags</span><span class="pi">:</span>
- <span class="s">version</span><span class="pi">:</span> <span class="s">1.1.1</span>
- <span class="s">weight</span><span class="pi">:</span> <span class="s">80</span> <span class="c1">#weight of 20%</span>
- <span class="pi">-</span> <span class="s">tags</span><span class="pi">:</span>
- <span class="s">version</span><span class="pi">:</span> <span class="s">1.1.2</span>
- <span class="s">weight</span><span class="pi">:</span> <span class="s">20</span> <span class="c1">#weight of 20%</span>
+ <span class="s">calculator</span><span class="pi">:</span> <span class="c1">#service name</span>
+ <span class="pi">-</span> <span class="s">precedence</span><span class="pi">:</span> <span class="s">2</span> <span class="c1">#precedence of route rule</span>
+ <span class="s">route</span><span class="pi">:</span> <span class="c1">#route rule list</span>
+ <span class="pi">-</span> <span class="s">tags</span><span class="pi">:</span>
+ <span class="s">version</span><span class="pi">:</span> <span class="s">1.1.1</span>
+ <span class="s">weight</span><span class="pi">:</span> <span class="s">70</span> <span class="c1">#weight of 20%</span>
+ <span class="pi">-</span> <span class="s">tags</span><span class="pi">:</span>
+ <span class="s">version</span><span class="pi">:</span> <span class="s">1.1.2</span>
+ <span class="s">weight</span><span class="pi">:</span> <span class="s">30</span> <span class="c1">#weight of 20%</span>
</code></pre>
</div>
</li>
@@ -467,7 +467,7 @@
<ul>
<li>
- <p>更改断流器配置，更改mersher-g的配置文件chassis.yaml，设置其中的断流器配置为：</p>
+ <p>1、 更改断流器配置，更改mersher_webapp的配置文件chassis.yaml，设置其中的断流器配置为：</p>
<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">isolation</span><span class="pi">:</span>
<span class="s">Consumer</span><span class="pi">:</span>
@@ -493,17 +493,22 @@
</code></pre>
</div>
</li>
+ <li>
+ <p>2、 关闭test_balance目录下的服务实例；</p>
+ </li>
</ul>
<h2 id="验证-1">验证</h2>
<ul>
<li>
- <p>1、传入负数参数，响应超时，mersher-g断流器生效 mersher-service-management-circuitbreaker</p>
+ <p>1、传入负数参数，响应超时，mersher_webapp断流器生效，下图一是mersher_webapp日志截图，表明断流器启用，下图二是传入负数参数触发断流器时的返回值，下图三表示断流器生效后对所有请求都按配置返回nil；</p>
<p><img src="/assets/images/mersher/mersher-circuitbreaker.png" alt="断流器生效日志图" /></p>
<p><img src="/assets/images/mersher/mersher-circuitbreaker-ret.png" alt="断流器生效日志图" /></p>
+
+ <p><img src="/assets/images/mersher/mersher-circuitbreaker-ret-nil.png" alt="断流器生效日志图" /></p>
</li>
<li>
<p>2、根据配置参数sleepWindowInMilliseconds，过10秒后服务自动恢复</p>
diff --git a/content/cn/docs/mersher-quick-start/index.html b/content/cn/docs/mersher-quick-start/index.html
index 7d4c526..d247db0 100644
--- a/content/cn/docs/mersher-quick-start/index.html
+++ b/content/cn/docs/mersher-quick-start/index.html
@@ -417,7 +417,7 @@
<section class="page__content" itemprop="text">
- <h1 id="安装-go-和-python-开发环境">安装 Go 和 Python 开发环境</h1>
+ <h1 id="安装运行环境">安装运行环境</h1>
<ul>
<li>
@@ -429,6 +429,9 @@
<li>
<p>安装<strong>python 2.7</strong>，详情可参考<a href="https://wiki.python.org/moin/BeginnersGuide/Download" target="_blank">python安装教程</a>。</p>
</li>
+ <li>
+ <p>安装<strong>nodejs v10.16.2</strong>，详情可参考<a href="https://nodejs.org/en/download/" target="_blank">nodejs安装教程</a>。</p>
+ </li>
</ul>
<h1 id="运行-service-center">运行 Service Center</h1>
@@ -453,48 +456,66 @@ docker run -d -p 30100:30100 servicecomb/service-center:latest
<h2 id="用例服务介绍">用例服务介绍</h2>
<ul>
- <li>1、 <strong>httpserver-a</strong>：基于go语言实现的http体质指数服务，可替换为任何语言开发的http服务；</li>
- <li>2、 <strong>httpserver-b</strong>：基于python语言实现的http体质指数服务，功能与httpserver-a相同，可替换为任何语言开发的http服务；</li>
- <li>3、 <strong>mersher-a</strong>：通过sidecar模式为httpserver-a提供服务的mersher实例；</li>
- <li>4、 <strong>mersher-b</strong>：通过sidecar模式为httpserver-b提供服务的mersher实例；</li>
- <li>5、 <strong>mersher-g</strong>：通过sidecar模式为httpserver-gateway提供服务的mersher实例；</li>
- <li>6、 <strong>servicecenter</strong>：服务中心，接收mesher服务的注册，提供服务发现、路由查询、服务监控功能；</li>
- <li>7、 <strong>webapp</strong>：来源于bmi示例，用于在浏览器上展示可视化结果，使用ajax发起http服务调用；</li>
<li>
- <p>8、 <strong>httpserver-gateway</strong>：内部服务服务统一出口，接收webapp服务请求，作为bmi（体质指数）客户端发起http请求；</p>
+ <p>如下图所示，用例中的服务部署在地址为192.168.88.64的机器上，用户在地址为192.168.88.78的机器上通过浏览器发起请求；</p>
+ </li>
+ <li>
+ <p>1、 <strong>httpserver_calculator</strong>：基于python语言实现的http体质指数服务，可替换为任何语言开发的http服务；</p>
+ </li>
+ <li>
+ <p>2、 <strong>httpserver_webapp</strong>：基于nodejs语言实现的web服务，用于在浏览器上展示可视化结果；</p>
+ </li>
+ <li>
+ <p>3、 <strong>mersher_webapp</strong>：通过sidecar模式为httpserver_webapp提供服务的mersher实例；</p>
+ </li>
+ <li>
+ <p>4、 <strong>mersher_calculator</strong>：通过sidecar模式为httpserver_calculator提供服务的mersher实例；</p>
+ </li>
+ <li>
+ <p>5、 <strong>servicecenter</strong>：服务中心，接收mesher服务的注册，提供服务发现、路由查询、服务监控功能；</p>
- <p><img src="/assets/images/mersher/mersher-deployment.png" alt="mersher部署图" /></p>
+ <p><img src="/assets/images/mersher/mersher-deployment-simple.png" alt="mersher部署图" /></p>
</li>
</ul>
<h2 id="流程详情">流程详情</h2>
<ul>
- <li>1、 浏览器通过 <strong>webapp</strong> 服务发起http调用<a href=""></a><a href="http://192.168.88.64:4538/bmi">http://192.168.88.64:4538/bmi</a>；</li>
- <li>2、 httpserver-gateway服务接收请求，并发起对地址<a href=""></a><a href="http://mersher-provider/bmi">http://mersher-provider/bmi</a>的http调用，因为设置了代理<a href=""></a><a href="http://127.0.0.1:30101">http://127.0.0.1:30101</a>，<strong>httpserver-gateway</strong> 发起的请求将被转发到 <strong>mersher-g</strong> 服务；</li>
- <li>3、 <strong>mersher-g</strong> 根据请求的服务名(microservice.yaml配置的服务名<strong>mersher-provider</strong>）从服务中心<strong>servicecenter</strong>获得该服务名的地址，根据负载均衡算法（默认轮询）转发到部署的两个<strong>mersher</strong>(<strong>mersher-a</strong>和<strong>mersher-b</strong>)之一；</li>
- <li>4、 <strong>mersher</strong>(<strong>mersher-a</strong>和<strong>mersher-b</strong>)服务根据设置好的spefic地址，转发到自己绑定的<strong>provider</strong>服务(<strong>httpserver_a</strong>和<strong>httpserver_b</strong>)服务进行处理；</li>
<li>
- <p>5、 <strong>httpserver_a</strong>和<strong>httpserver_b</strong>会根据用户身高和体重进行计算，并返回自己的服务标识展示在界面上；流程图如下所示：</p>
+ <p>1、 浏览器[192.168.88.78]对 <strong>httpserver_webapp</strong> 服务发起http调用<a href=""></a><a href="http://192.168.88.64:4597/calculator/bmi">http://192.168.88.64:4597/calculator/bmi</a>；</p>
+ </li>
+ <li>
+ <p>2、 httpserver_webapp服务接收请求，并发起对地址<a href=""></a><a href="http://calculator/bmi">http://calculator/bmi</a>的http调用，因为设置了代理<a href=""></a><a href="http://127.0.0.1:30101">http://127.0.0.1:30101</a>，<strong>httpserver_webapp</strong> 发起的请求将被转发到 <strong>mersher_webapp</strong> 服务；</p>
+ </li>
+ <li>
+ <p>3、 <strong>mersher_webapp</strong> 根据请求的服务名(microservice.yaml配置的服务名<strong>calculator</strong>）从服务中心<strong>servicecenter</strong>获得该服务名的地址，转发到<strong>mersher_calculator</strong>；</p>
+ </li>
+ <li>
+ <p>4、 <strong>mersher_calculator</strong>服务根据设置好的specific地址，转发到自己绑定的体质指数<strong>calculator</strong>服务(<strong>httpserver_calculator</strong>)进行处理；</p>
+ </li>
+ <li>
+ <p>5、 <strong>httpserver_calculator</strong>会根据用户身高和体重进行计算，并返回自己的服务标识展示在界面上；流程图如下所示：</p>
- <p><img src="/assets/images/mersher/mersher-flowchart.png" alt="mersher流程图" /></p>
+ <p><img src="/assets/images/mersher/mersher-flowchart-simple.png" alt="mersher流程图" /></p>
</li>
</ul>
<h2 id="环境搭建">环境搭建</h2>
<ul>
- <li>1、 编译 <strong>mersher</strong> ：<a href="https://github.com/apache/servicecomb-mesher">下载地址</a>, 按README.md编译项目 得到可执行文件mersher（linux），windows（mersher.exe）；</li>
<li>
- <p>2、 创建 <strong>mersher-g</strong> 用于接收客户端请求： 在mersher目录下执行下列linux命令创建mersher-g，此处除了可执行文件，还需要拷贝conf</p>
+ <p>1、 编译 <strong>mersher</strong> ：<a href="https://github.com/apache/servicecomb-mesher">下载地址</a>， 按README.md编译项目得到可执行文件mersher(linux)，windows(mersher.exe)；</p>
+ </li>
+ <li>
+ <p>2、 创建 <strong>mersher_webapp</strong> 用于为<strong>httpserver_webapp</strong>服务： 在mersher目录下执行下列linux命令创建mersher_webapp，此处除了可执行文件，还需要拷贝conf</p>
- <div class="language-bash highlighter-rouge"><pre class="highlight"><code>mkdir /usr/local/src/mersher-g
-cp ./mesher /usr/local/src/mersher-g
-cp -r ./conf /usr/local/src/mersher-g
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>mkdir /usr/local/src/mersher_webapp
+cp ./mesher /usr/local/src/mersher_webapp
+cp -r ./conf /usr/local/src/mersher_webapp
</code></pre>
</div>
- <p>更改conf中配置文件，microservice.yaml中的<strong>服务name</strong>，从hellomesher改为<strong>mersher-consumer</strong>；更改chassis.yaml中监听的服务地址，从本地回环（127.0.0.1）地址改为<strong>内网ip</strong>（linux下通过ifconfig查看，如192.168.88.64）:</p>
+ <p>更改conf中配置文件，microservice.yaml中的<strong>服务name</strong>，从hellomesher改为<strong>webapp</strong>；更改chassis.yaml中监听的服务地址，从本地回环（127.0.0.1）地址改为<strong>内网ip</strong>（linux下通过ifconfig查看，如192.168.88.64）:</p>
<div class="language-bash highlighter-rouge"><pre class="highlight"><code>listenAddress: 127.0.0.1:40101 -----》 listenAddress: 192.168.88.64:40101
listenAddress: 127.0.0.1:30101 -----》 listenAddress: 192.168.88.64:30101
@@ -503,87 +524,70 @@ listenAddress: 127.0.0.1:30102 -----》 listenAddress: 192.168.88.64:30102
</div>
</li>
<li>
- <p>3、 创建mersher-a和mersher-b</p>
-
- <div class="language-bash highlighter-rouge"><pre class="highlight"><code>mkdir /usr/local/src/mersher-a
-cp ./mesher /usr/local/src/mersher-a
-cp -r ./conf /usr/local/src/mersher-a
-mkdir /usr/local/src/mersher-b
-cp ./mesher /usr/local/src/mersher-b
-cp -r ./conf /usr/local/src/mersher-b
+ <p>3、 创建<strong>mersher_calculator</strong></p>
+
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>mkdir /usr/local/src/mersher_calculator
+cp ./mesher /usr/local/src/mersher_calculator
+cp -r ./conf /usr/local/src/mersher_calculator
</code></pre>
</div>
- <p>更改conf中配置文件，分别更改<strong>microservice.yaml</strong>中的<strong>服务name</strong>为相同的<strong>mersher-provider</strong>；<br />
-更改<strong>mersher-a</strong>配置<strong>chassis.yaml</strong>监听的地址和端口：</p>
+ <p>更改conf中配置文件，分别更改<strong>microservice.yaml</strong>中的<strong>服务name</strong>为体质指数微服务名<strong>calculator</strong>；<br />
+更改<strong>mersher_calculator</strong>配置<strong>chassis.yaml</strong>监听的地址和端口：</p>
<div class="language-bash highlighter-rouge"><pre class="highlight"><code>listenAddress: 127.0.0.1:40101 -----》 listenAddress: 192.168.88.64:40107
listenAddress: 127.0.0.1:30101 -----》 listenAddress: 192.168.88.64:30111
listenAddress: 127.0.0.1:30102 -----》 listenAddress: 192.168.88.64:30112
</code></pre>
</div>
-
- <p>更改<strong>mersher-b</strong>配置<strong>chassis.yaml</strong>监听的地址和端口：</p>
-
- <div class="language-bash highlighter-rouge"><pre class="highlight"><code> listenAddress: 127.0.0.1:40101 -----》 listenAddress: 192.168.88.64:40102
- listenAddress: 127.0.0.1:30101 -----》 listenAddress: 192.168.88.64:30108
- listenAddress: 127.0.0.1:30102 -----》 listenAddress: 192.168.88.64:30109
-</code></pre>
- </div>
</li>
<li>
- <p>4、 启动mersher服务，分别进入mersher-g、mersher-a和mersher-b，启动服务，其中需要设置mersher-a和mersher-b的SPECIFIC_ADDR地址，该地址用于将mersher和http服务绑定起来；</p>
+ <p>4、 启动mersher服务，分别进入<strong>mersher_webapp</strong>和<strong>mersher_calculator</strong>，启动服务，其中需要设置mersher_calculator的<strong>SPECIFIC_ADDR</strong>地址，该地址用于将mersher和http服务绑定起来；</p>
- <div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="nb">cd</span> /usr/local/src/mersher-a
-<span class="nb">export </span><span class="nv">SPECIFIC_ADDR</span><span class="o">=</span>127.0.0.1:4537
-./mersher
-</code></pre>
- </div>
-
- <div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="nb">cd</span> /usr/local/src/mersher-b
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="nb">cd</span> /usr/local/src/mersher_calculator
<span class="nb">export </span><span class="nv">SPECIFIC_ADDR</span><span class="o">=</span>127.0.0.1:4540
./mersher
</code></pre>
</div>
- <div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="nb">cd</span> /usr/local/src/mersher-g
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="nb">cd</span> /usr/local/src/mersher_webapp
./mersher
</code></pre>
</div>
</li>
<li>
- <p>5、 搭建<strong>httpserver</strong>作为http provier服务，<strong>httpserver-gateway</strong>作为http client服务：</p>
+ <p>5、 启动<strong>httpserver_webapp</strong>服务：</p>
- <div class="language-bash highlighter-rouge"><pre class="highlight"><code>go build httpserver.go
-./httpserver.go
-go build httpservergateway.go
-./httpservergateway
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="nb">cd</span> /usr/local/src/httpserver_webapp
+node ./httpserver_webapp.js
</code></pre>
</div>
</li>
<li>
- <p>6、运行<strong>http_server.py</strong>程序，需要安装python2.7，依赖BaseHTTPServer包；</p>
+ <p>6、 <strong>httpserver_calculator</strong>作为体质指数计算服务，需要安装python2.7，依赖BaseHTTPServer包：</p>
+
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="nb">cd</span> /usr/local/src/httpserver_calculator
+./httpserver_calculator.py
+</code></pre>
+ </div>
</li>
- <li>7、 使用<a href="/cn/docs/quick-start.md/"><strong>Bmi体质指数</strong></a> 中的webapp作为展示服务，将webapp/src/main/resources/static/index.html 静态页面中 ajax调用的地址从/calculator/bmi?height=改为<a href=""></a><a href="http://192.168.88.64:4538/bmi?height=">http://192.168.88.64:4538/bmi?height=</a> 这个地址是httpservergateway客户端服务的监听地址，更新application.yaml中的监听端口为192.168.88.64；</li>
</ul>
<h2 id="开始测试">开始测试</h2>
<ul>
<li>
- <p>1、 浏览器打开页面<a href="http://192.168.88.64:30103">http://192.168.88.64:30103</a> (如果打不开需要开启服务中心service-center的front服务，参考 «http://servicecomb.apache.org/cn/users/setup-environment/#%E8%BF%90%E8%A1%8Cservice-center>) 查看服务，可以看到如下界面。其中gateway是上述的webapp服务，这里展示的是microservice.yaml中配置的服务名。大写的SERVICECENTER是服务中心；</p>
+ <p>1、 浏览器打开页面<a href="http://192.168.88.64:30103">http://192.168.88.64:30103</a> (如果打不开需要开启服务中心service-center的front服务，参考 <a href="http://servicecomb.apache.org/cn/users/setup-environment/#%E8%BF%90%E8%A1%8Cservice-center">http://servicecomb.apache.org/cn/users/setup-environment/#%E8%BF%90%E8%A1%8Cservice-center</a>) 查看服务，其中地址service-center服务启动的地址，看到如图界面。<strong>webapp</strong>代表<strong>mersher_webapp</strong>服务，这里展示的是microservice.yaml中配置的服务名。<strong>calculator</strong>代表<strong>mersh [...]
<p><img src="/assets/images/mersher/mersher-servercenter.png" alt="服务中心监控图" /></p>
</li>
<li>
- <p>2、 浏览器打开<a href="http://192.168.88.64:8889">http://192.168.88.64:8889</a>，可以看到如下界面，为webapp呈现的静态页面：</p>
+ <p>2、 浏览器打开<a href="http://192.168.88.64:4597">http://192.168.88.64:4597</a>，可以看到如下界面，为webapp呈现的静态页面：</p>
<p><img src="/assets/images/mersher/mersher-testinit.png" alt="bmi测试初始化图" /></p>
</li>
<li>
- <p>3、 输入参数(180、70)点击submit，观察BMI Instance ID变化：</p>
-
- <p><img src="/assets/images/mersher/mersher-testgohttp.png" alt="bmi测试初始化图" /><br /></p>
+ <p>3、 输入参数(180、70)点击submit，显示如下图：</p>
<p><img src="/assets/images/mersher/mersher-testpythonhttp.png" alt="bmi测试初始化图" /></p>
</li>
@@ -592,7 +596,7 @@ go build httpservergateway.go
<h1 id="下一步">下一步</h1>
<ul>
- <li>阅读<a href="/cn/docs/mersher-quick-start-advance.md/"><strong>mersher</strong>进阶</a>。</li>
+ <li>阅读<a href="/cn/docs/mersher-quick-start-advance/"><strong>mersher</strong>进阶</a>。</li>
</ul>
diff --git a/content/docs/mersher-quick-start-advance/mersher-distributed-tracing/index.html b/content/docs/mersher-quick-start-advance/mersher-distributed-tracing/index.html
index 96c8da1..3091851 100644
--- a/content/docs/mersher-quick-start-advance/mersher-distributed-tracing/index.html
+++ b/content/docs/mersher-quick-start-advance/mersher-distributed-tracing/index.html
@@ -417,7 +417,7 @@
<section class="page__content" itemprop="text">
<ul>
- <li>Distributed handler chain tracking provides the ability of tracing microservice call relationships and watching delays of calling processing. It is used to make it easy for users to check the health of microservices in a distributed environment. This guide will show you how to use the distributed handler chain tracking capabilities provided by <strong>mersher</strong>.</li>
+ <li>Distributed handler chain tracking provides the ability of tracing microservice call relationships and watching processing time. It is used to make it easy for users to check the health of microservices in a distributed environment. This guide will show you how to use the distributed handler chain tracking capabilities provided by <strong>mersher</strong>.</li>
</ul>
<h1 id="foreword">Foreword</h1>
@@ -442,7 +442,7 @@
<p><img src="/assets/images/mersher/mersher-tracing-func.png" alt="tracing-func" /></p>
</li>
<li>
- <p>3 Recompile and replace the executables of <strong>mersher-g</strong>,<strong>mersher-a</strong> and <strong>mersher-b</strong>.Then start the mersher service respectively.</p>
+ <p>3 Recompile and replace the executable file of <strong>mersher_webapp</strong> and <strong>mersher_calculator</strong>. Then start the mersher service respectively.</p>
</li>
<li>
<p>4 Running Zipkin Distributed tracking service with docker.</p>
@@ -452,12 +452,10 @@
</div>
</li>
<li>
- <p>5 Multiple clicks on the <em>Submit</em> button to initiate multiple service calls.</p>
+ <p>5 Click on the <em>Submit</em> button to initiate http call.</p>
</li>
<li>
- <p>6 Open <a href="http://192.168.88.64:9411">http://192.168.88.64:9411</a> to view the distributed tracking results. You can see the call chains and call delays of <strong>mersher-a</strong> (listening port 30108) and <strong>mersher-b</strong> (listening port 30111).</p>
-
- <p><img src="/assets/images/mersher/mersher-tracing-30108.png" alt="Distributed tracking rendering 30108" /><br /></p>
+ <p>6 Open <a href="http://192.168.88.64:9411">http://192.168.88.64:9411</a> to view the distributed tracking results. You can see the call chains and processing time of http call.</p>
<p><img src="/assets/images/mersher/mersher-tracing-30111.png" alt="Distributed tracking rendering 30111" /></p>
</li>
diff --git a/content/docs/mersher-quick-start-advance/mersher-flow-control/index.html b/content/docs/mersher-quick-start-advance/mersher-flow-control/index.html
index bb93e34..cd6f36a 100644
--- a/content/docs/mersher-quick-start-advance/mersher-flow-control/index.html
+++ b/content/docs/mersher-quick-start-advance/mersher-flow-control/index.html
@@ -430,7 +430,7 @@
<ul>
<li>
- <p>Change the <strong>mersher-a’s</strong> configuration file <strong>chassis.yaml</strong>. Add a flow control configuration in <strong>chassis.yaml</strong> as follows. Restart the service.</p>
+ <p>Change the configuration file <strong>chassis.yaml</strong> of <strong>mersher_calculator</strong>. Add a flow control configuration in <strong>chassis.yaml</strong> as follows. Restart the service.</p>
<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">flowcontrol</span><span class="pi">:</span>
<span class="s">Provider</span><span class="pi">:</span>
@@ -450,7 +450,7 @@
<h1 id="verification">Verification</h1>
<ul>
- <li>Click the <em>Submit</em> button and you can see that the request was rejected due to the flow control of mersher. Now the request can’t reach real httpserver.</li>
+ <li>Click the <em>Submit</em> button and you can see that the request was rejected due to the flow control of mersher. Now the request can not reach real httpserver.</li>
</ul>
<p><img src="/assets/images/mersher/mersher-flow-control-fail.png" alt="flow-control-req" /></p>
diff --git a/content/docs/mersher-quick-start-advance/mersher-load-balance/index.html b/content/docs/mersher-quick-start-advance/mersher-load-balance/index.html
index a8a8c49..e738cea 100644
--- a/content/docs/mersher-quick-start-advance/mersher-load-balance/index.html
+++ b/content/docs/mersher-quick-start-advance/mersher-load-balance/index.html
@@ -430,7 +430,27 @@
<ul>
<li>
- <p>The <strong>Roundbin</strong> load balancing algorithm is used by default and the <strong>Random</strong>, SessionStickiness load balancing algorithms are also supported. We configure the load balancing method <strong>Random</strong> by modifing <strong>mersher-g’s</strong> configuration file chassis.yaml.</p>
+ <p>You can start a new <strong>mersher_calculator</strong> and <strong>httpserver_calculator</strong> instance for load balancing testing by using the program in example directory <a href="https://github.com/apache/servicecomb-mesher/tree/master/examples/quick_start/test_balance">test_balance</a></p>
+ </li>
+ <li>
+ <p>1 Change the <strong>service name</strong> in file <strong>microservice.yaml</strong> to <strong>calculator</strong>. Change the listening address and port in file <strong>chassis.yaml</strong> to avoid conflicts.</p>
+
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>listenAddress: 127.0.0.1:40101 -----》 listenAddress: 192.168.88.64:40102
+listenAddress: 127.0.0.1:30101 -----》 listenAddress: 192.168.88.64:30108
+listenAddress: 127.0.0.1:30102 -----》 listenAddress: 192.168.88.64:30109
+</code></pre>
+ </div>
+ </li>
+ <li>
+ <p>2 Start running mersher_calculator by cmd:</p>
+
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="nb">export </span><span class="nv">SPECIFIC_ADDR</span><span class="o">=</span>127.0.0.1:4537
+./mersher
+</code></pre>
+ </div>
+ </li>
+ <li>
+ <p>3 The <strong>Roundbin</strong> load balancing algorithm is used by default and the Random, SessionStickiness load balancing algorithms are also supported. We configure the load balancing method <strong>Random</strong> by modifing configuration file chassis.yaml of <strong>mersher_webapp</strong>.</p>
<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">loadbalance</span><span class="pi">:</span>
<span class="s">strategy</span><span class="pi">:</span>
@@ -438,6 +458,9 @@
</code></pre>
</div>
</li>
+ <li>
+ <p>4 Run a new services instance of <strong>httpserver_calculator</strong> which is listenning on port 4537.</p>
+ </li>
</ul>
<h1 id="verification">Verification</h1>
@@ -446,9 +469,9 @@
<li>
<p>Multiple clicks the <em>Submit</em> button and we can see that the BMI Instance ID in the following two interfaces appear randomly.</p>
- <p><img src="/assets/images/mersher/mersher-testgohttp.png" alt="mersher-test-httpgo" /><br /></p>
+ <p><img src="/assets/images/mersher/mersher-testpythonhttp.png" alt="mersher-test-httppy1" /><br /></p>
- <p><img src="/assets/images/mersher/mersher-testpythonhttp.png" alt="mersher-test-httppy" /></p>
+ <p><img src="/assets/images/mersher/mersher-testpythonhttp2.png" alt="mersher-test-httppy2" /></p>
</li>
</ul>
diff --git a/content/docs/mersher-quick-start-advance/mersher-service-management/index.html b/content/docs/mersher-quick-start-advance/mersher-service-management/index.html
index 90402c9..06df84f 100644
--- a/content/docs/mersher-quick-start-advance/mersher-service-management/index.html
+++ b/content/docs/mersher-quick-start-advance/mersher-service-management/index.html
@@ -423,7 +423,7 @@
<h1 id="before-you-start">Before you start</h1>
<ul>
- <li>Walk through <a href="/docs/mersher-quick-start/">mersher-quick-start</a> and have <strong>mersher display programs</strong> running.</li>
+ <li>Walk through <a href="/docs/mersher-quick-start/">mersher-quick-start</a>, <a href="/docs/quick-start-advance/load-balance/">mersher-load-balance</a> and have <strong>mersher display programs</strong> running.</li>
</ul>
<h1 id="grayscale-release">Grayscale release</h1>
@@ -432,23 +432,23 @@
<ul>
<li>
- <p>1、Change the version number respectively in conf <strong>microservice.yaml</strong> of <strong>mersher-a</strong> and <strong>mersher-b</strong>. Change the <strong>version</strong> field to <strong>1.1.1</strong> and <strong>1.1.2</strong> respectively.Restart the mersher service and you can see that the service version number has changed in servicecenter.</p>
+ <p>1 Change the version number to <strong>1.1.1</strong> and <strong>1.1.2</strong> respectively in conf <strong>microservice.yaml</strong> of two <strong>mersher_calculator</strong> instances. Restart the mersher service and you can see that the service version number has changed in <strong>servicecenter</strong>.</p>
<p><img src="/assets/images/mersher/mersher-ser-manage-ver.png" alt="mersher-ser-manage-ver" /></p>
</li>
<li>
- <p>2、Change weight options in configuration files router.yaml of mersher-g. Then restart service.</p>
+ <p>2 Change weight options in configuration file router.yaml of mersher_webapp. Then restart service.</p>
<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">routeRule</span><span class="pi">:</span>
-<span class="s">mersher-provider</span><span class="pi">:</span> <span class="c1">#service name</span>
-<span class="pi">-</span> <span class="s">precedence</span><span class="pi">:</span> <span class="s">2</span> <span class="c1">#precedence of route rule</span>
- <span class="s">route</span><span class="pi">:</span> <span class="c1">#route rule list</span>
- <span class="pi">-</span> <span class="s">tags</span><span class="pi">:</span>
- <span class="s">version</span><span class="pi">:</span> <span class="s">1.1.1</span>
- <span class="s">weight</span><span class="pi">:</span> <span class="s">80</span> <span class="c1">#weight of 80%</span>
- <span class="pi">-</span> <span class="s">tags</span><span class="pi">:</span>
- <span class="s">version</span><span class="pi">:</span> <span class="s">1.1.2</span>
- <span class="s">weight</span><span class="pi">:</span> <span class="s">20</span> <span class="c1">#weight of 20%</span>
+ <span class="s">calculator</span><span class="pi">:</span> <span class="c1">#service name</span>
+ <span class="pi">-</span> <span class="s">precedence</span><span class="pi">:</span> <span class="s">2</span> <span class="c1">#precedence of route rule</span>
+ <span class="s">route</span><span class="pi">:</span> <span class="c1">#route rule list</span>
+ <span class="pi">-</span> <span class="s">tags</span><span class="pi">:</span>
+ <span class="s">version</span><span class="pi">:</span> <span class="s">1.1.1</span>
+ <span class="s">weight</span><span class="pi">:</span> <span class="s">70</span> <span class="c1">#weight of 20%</span>
+ <span class="pi">-</span> <span class="s">tags</span><span class="pi">:</span>
+ <span class="s">version</span><span class="pi">:</span> <span class="s">1.1.2</span>
+ <span class="s">weight</span><span class="pi">:</span> <span class="s">30</span> <span class="c1">#weight of 20%</span>
</code></pre>
</div>
</li>
@@ -466,7 +466,7 @@
<ul>
<li>
- <p>Change the circuit breaker configuration in chassis.yaml of mersher-g.</p>
+ <p>1 Change the circuit breaker configuration in conf chassis.yaml of mersher_webapp.</p>
<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">isolation</span><span class="pi">:</span>
<span class="s">Consumer</span><span class="pi">:</span>
@@ -492,20 +492,25 @@
</code></pre>
</div>
</li>
+ <li>
+ <p>2 Stop the service instances in directory test_balance.</p>
+ </li>
</ul>
<h2 id="verification-1">Verification</h2>
<ul>
<li>
- <p>1 The circuit breaker of mersher-g takes effect when a negative parameter is passed in.</p>
+ <p>1 The circuit breaker of mersher_webapp takes effect when a negative parameter is passed in. The first picture is the log of <strong>mersher_webapp</strong>. The second picture is the return value when inputing negative parameter. The third picture is the return value when the circuit breaker of mersher_webapp takes effect.</p>
<p><img src="/assets/images/mersher/mersher-circuitbreaker.png" alt="mersher-circuitbreaker" /></p>
<p><img src="/assets/images/mersher/mersher-circuitbreaker-ret.png" alt="mersher-circuitbreaker-ret" /></p>
+
+ <p><img src="/assets/images/mersher/mersher-circuitbreaker-ret-nil.png" alt="mersher-circuitbreaker-ret-nil" /></p>
</li>
<li>
- <p>2 The service is automatically restored after 10 seconds because of the configuration parameter ‘sleepWindowInMilliseconds’ take effect.</p>
+ <p>2 The service is automatically restored after 10 seconds because of the conf parameter <strong>sleepWindowInMilliseconds</strong>.</p>
</li>
</ul>
@@ -513,7 +518,7 @@
<ul>
<li>
- <p>Read<a href="/docs/mersher-quick-start-advance/mersher-distributed-tracing/">mersher distributed tracing</a></p>
+ <p>Read <a href="/docs/mersher-quick-start-advance/mersher-distributed-tracing/">mersher distributed tracing</a></p>
</li>
<li>
<p>More about <a href="/users/service-configurations/">service management</a></p>
diff --git a/content/docs/mersher-quick-start/index.html b/content/docs/mersher-quick-start/index.html
index ed073fa..06a06e1 100644
--- a/content/docs/mersher-quick-start/index.html
+++ b/content/docs/mersher-quick-start/index.html
@@ -416,7 +416,7 @@
<section class="page__content" itemprop="text">
- <h1 id="install-go-and-python-development-environment">Install Go and Python development environment</h1>
+ <h1 id="install-development-environment">Install development environment</h1>
<ul>
<li>
@@ -426,13 +426,16 @@
<p>Install <strong>golang 1.12.7</strong>. Get details <a href="https://golang.google.cn/doc/install" target="_blank">Go Installation tutorial</a>.</p>
</li>
<li>
- <p>Install <strong>python 2.7</strong>. Get details <a href="https://wiki.python.org/moin/BeginnersGuide/Download" target="_blank">python Installation tutorial</a>。</p>
+ <p>Install <strong>python 2.7</strong>. Get details <a href="https://wiki.python.org/moin/BeginnersGuide/Download" target="_blank">python Installation tutorial</a>.</p>
+ </li>
+ <li>
+ <p>Install <strong>nodejs v10.16.2</strong>. Get details <a href="https://nodejs.org/en/download/" target="_blank">nodejs download</a>。</p>
</li>
</ul>
<h1 id="run-service-center">Run Service Center</h1>
-<p>In the <strong>ServiceComb</strong> microservices framework, <strong>Service Center</strong> provides service registration and service discovery, which can be run directly using Docker.</p>
+<p>In the <strong>ServiceComb</strong> microservices framework, <strong>Service Center</strong> provides service registration and service discovery.</p>
<div class="language-bash highlighter-rouge"><pre class="highlight"><code>docker pull servicecomb/service-center
docker run -d -p 30100:30100 servicecomb/service-center:latest
@@ -446,54 +449,51 @@ docker run -d -p 30100:30100 servicecomb/service-center:latest
<h2 id="background">Background</h2>
<ul>
- <li>This use case is mainly to help users get started quickly with <strong>mersher sidecar mode</strong>. We hope that users can understand the working mode of mersher and learn how to merge the existing http service into the ServiceComb micro-service system with mersher’s help. The final goal is to help user get the micro-service capabilities such as load balancing, flow control, service management and call chain tracing provided by servicecomb. The full case will be submitted to <a h [...]
+ <li>This use case is mainly to help users get started quickly with <strong>mersher sidecar</strong> mode. We hope that users can understand the working mode of mersher and learn how to merge the existing http service into the ServiceComb micro-service system with mersher. The final goal is to help user get the micro-service capabilities such as load balancing, flow control, service management and call chain tracing provided by servicecomb. The full case will be submitted to <a href="ht [...]
</ul>
<h2 id="mersher-use-case-service-introduction">Mersher use case service introduction</h2>
<ul>
- <li>1 <strong>httpserver-a</strong>: A http server based on golang which is for BMI calculator and can be developed by any language.</li>
- <li>2 <strong>httpserver-b</strong>: A http server based on python which is for BMI calculator and can be developed by any language.</li>
- <li>3 <strong>mersher-a</strong>: A mersher instance which serves for httpserver-a via sidecar mode.</li>
- <li>4 <strong>mersher-b</strong>: A mersher instance which serves for httpserver-b via sidecar mode.</li>
- <li>5 <strong>mersher-g</strong>: A mersher instance which serves for httpserver-gateway via sidecar mode.</li>
- <li>6 <strong>servicecenter</strong>: Servicecenter which receives registration of mesher service and provides services as service discovery, routing query, service monitoring and so on.</li>
- <li>7 <strong>webapp</strong>: A http server which reuses the bmi example service is used for displaying visual results on the browser and using ajax to execute http service calls.</li>
- <li>
- <p>8 <strong>httpserver-gateway</strong>: A http server which is used as an unified export of internal services receives webapp’s requestand and then execute HTTP request as a BMI client.</p>
-
- <p><img src="/assets/images/mersher/mersher-deployment.png" alt="mersher deployment diagram" /></p>
- </li>
+ <li>1 <strong>httpserver_calculator</strong>. A http server based on python which is for BMI calculator and can be developed by any language.</li>
+ <li>2 <strong>httpserver_webapp</strong>. A http server based on nodejs which is used for displaying results on the browser.</li>
+ <li>3 <strong>mersher_webapp</strong>. A mersher instance which serves for httpserver_webapp via sidecar mode.</li>
+ <li>4 <strong>mersher_calculator</strong>. A mersher instance which serves for httpserver_calculator via sidecar mode.</li>
+ <li>5 <strong>servicecenter</strong>. Servicecenter which receives registration of mesher service and provides services as service discovery, routing query, service monitoring and so on.</li>
</ul>
+<p><img src="/assets/images/mersher/mersher-deployment-simple.png" alt="mersher deployment diagram" /></p>
+
<h2 id="process-details">Process details</h2>
<ul>
- <li>1 The browser execute a http call via the <strong>webapp</strong> service <a href=""></a><a href="http://192.168.88.64:4538/bmi">http://192.168.88.64:4538/bmi</a>.</li>
- <li>2 The httpserver-gateway service receives the request and execute http call <a href=""></a><a href="http://mersher-provider/bmi">http://mersher-provider/bmi</a>. Because the proxy is set as <a href=""></a><a href="http://127.0.0.1:30101">http://127.0.0.1:30101</a>, the request initiated by <strong>httpserver-gateway</strong> will be forwarded to the <strong>mersher-g</strong> service.</li>
- <li>3 <strong>mersher-g</strong> gets the address of the service name from the <strong>servicecenter</strong> based on the requested service name(the service name <strong>mersher-provider</strong> here is configured in microservice.yaml) and forwarded to one of the two <strong>mersher</strong> (<strong>mersher-a</strong> and <strong>mersher-b</strong>) according to the load balancing algorithm (default polling);</li>
- <li>4 <strong>mersher</strong> (<strong>mersher-a</strong> and <strong>mersher-b</strong>) services forward http requests to their own <strong>provider</strong> service (<strong>httpserver_a</strong> or <strong>httpserver_b</strong>) based on the spefic address.</li>
+ <li>1 The browser[192.168.88.78] execute a http call to the <strong>httpserver_webapp</strong> service with url <a href=""></a><a href="http://192.168.88.64:4597/calculator/bmi">http://192.168.88.64:4597/calculator/bmi</a>.</li>
+ <li>2 The httpserver_webapp service receives the request and execute http call <a href=""></a><a href="http://calculator/bmi">http://calculator/bmi</a>. Because the proxy is set as <a href=""></a><a href="http://127.0.0.1:30101">http://127.0.0.1:30101</a>, the request initiated by <strong>httpserver_webapp</strong> will be forwarded to the <strong>mersher_webapp</strong> service.</li>
+ <li>3 <strong>mersher_webapp</strong> gets the address of the service name(the service name <strong>calculator</strong> here is configured in microservice.yaml) from the <strong>servicecenter</strong> and forwarded to <strong>mersher_calculator</strong>.</li>
+ <li>4 <strong>mersher_calculator</strong> service forward http requests to the <strong>httpserver_calculator</strong> service.</li>
<li>
- <p>5 <strong>httpserver_a</strong> and <strong>httpserver_b</strong> will calculate according to the user’s height and weight, and return their own service ID displayed on the interface. The flow chart is as follows:</p>
+ <p>5 <strong>httpserver_calculator</strong> will calculate according to the input parameters(height and weight). The result containing service id and body mass index will be displayed on the browser. The flow chart is as follows:</p>
- <p><img src="/assets/images/mersher/mersher-flowchart.png" alt="mersher-flow-chart" /></p>
+ <p><img src="/assets/images/mersher/mersher-flowchart-simple.png" alt="mersher-flow-chart" /></p>
</li>
</ul>
<h2 id="environmental-construction">Environmental construction</h2>
<ul>
- <li>1 Compile <strong>mersher</strong> in <a href="https://github.com/apache/servicecomb-mesher">download</a>. Download the project by README.md to get the executable mersher(linux) or mersher.exe(windows).</li>
<li>
- <p>2 Create <strong>mersher-g</strong> to receive client requests. In the mersher directory execute the following linux command to create mersher-g. In order to the execute mersher you also need to copy the conf.</p>
+ <p>1 Compile <strong>mersher</strong> <a href="https://github.com/apache/servicecomb-mesher">download</a>. Download the project and get the executable mersher(linux) or mersher.exe(windows) by README.md.</p>
+ </li>
+ <li>
+ <p>2 Create <strong>mersher_webapp</strong> which serves for <strong>httpserver_webapp</strong>. In the mersher directory execute the following linux command to create mersher_webapp. In order to the run mersher you also need to copy the conf.</p>
- <div class="language-bash highlighter-rouge"><pre class="highlight"><code>mkdir /usr/local/src/mersher-g
-cp ./mesher /usr/local/src/mersher-g
-cp -r ./conf /usr/local/src/mersher-g
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>mkdir /usr/local/src/mersher_webapp
+cp ./mesher /usr/local/src/mersher_webapp
+cp -r ./conf /usr/local/src/mersher_webapp
</code></pre>
</div>
- <p>Change <strong>service name</strong> in microservice.yaml from hellemesher to <strong>mersher-consumer</strong>. Change the listening service address in chassis.yaml from 127.0.0.1 to <strong>intranet ip</strong>（Viewed by cmd ifconfig in linux, such as 192.168.88.64）:</p>
+ <p>Change <strong>service name</strong> in microservice.yaml from hellemesher to <strong>webapp</strong>. Change the listening service address in chassis.yaml from 127.0.0.1 to <strong>intranet ip</strong>(Viewed by cmd ifconfig in linux, such as 192.168.88.64).</p>
<div class="language-bash highlighter-rouge"><pre class="highlight"><code>listenAddress: 127.0.0.1:40101 -----》 listenAddress: 192.168.88.64:40101
listenAddress: 127.0.0.1:30101 -----》 listenAddress: 192.168.88.64:30101
@@ -502,87 +502,70 @@ listenAddress: 127.0.0.1:30102 -----》 listenAddress: 192.168.88.64:30102
</div>
</li>
<li>
- <p>3 Create mersher-a and mersher-b services.</p>
-
- <div class="language-bash highlighter-rouge"><pre class="highlight"><code>mkdir /usr/local/src/mersher-a
-cp ./mesher /usr/local/src/mersher-a
-cp -r ./conf /usr/local/src/mersher-a
-mkdir /usr/local/src/mersher-b
-cp ./mesher /usr/local/src/mersher-b
-cp -r ./conf /usr/local/src/mersher-b
+ <p>3 Create mersher_calculator service.</p>
+
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code>mkdir /usr/local/src/mersher_calculator
+cp ./mesher /usr/local/src/mersher_calculator
+cp -r ./conf /usr/local/src/mersher_calculator
</code></pre>
</div>
- <p>Change the <strong>service name</strong> in <strong>microservice.yaml</strong> from hellemesher to <strong>mersher-provider</strong> for both mersher-a and mersher-b<br />
-Change the listening address and port set in the <strong>mersher-a</strong> configuration file <strong>chassis.yaml</strong>:</p>
+ <p>Change the <strong>service name</strong> in conf file <strong>microservice.yaml</strong> from hellemesher to <strong>calculator</strong>.<br />
+Change the listening address and port in conf file <strong>chassis.yaml</strong>.</p>
<div class="language-bash highlighter-rouge"><pre class="highlight"><code>listenAddress: 127.0.0.1:40101 -----》 listenAddress: 192.168.88.64:40107
listenAddress: 127.0.0.1:30101 -----》 listenAddress: 192.168.88.64:30111
listenAddress: 127.0.0.1:30102 -----》 listenAddress: 192.168.88.64:30112
</code></pre>
</div>
-
- <p>Change the listening address and port set in the <strong>mersher-b</strong> configuration file <strong>chassis.yaml</strong>:</p>
-
- <div class="language-bash highlighter-rouge"><pre class="highlight"><code> listenAddress: 127.0.0.1:40101 -----》 listenAddress: 192.168.88.64:40102
- listenAddress: 127.0.0.1:30101 -----》 listenAddress: 192.168.88.64:30108
- listenAddress: 127.0.0.1:30102 -----》 listenAddress: 192.168.88.64:30109
-</code></pre>
- </div>
</li>
<li>
- <p>4 Start running mersher-g, mersher-a and mersher-b respectively by cmd.</p>
-
- <div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="nb">cd</span> /usr/local/src/mersher-a
-<span class="nb">export </span><span class="nv">SPECIFIC_ADDR</span><span class="o">=</span>127.0.0.1:4537
-./mersher
-</code></pre>
- </div>
+ <p>4 Run mersher_webapp and mersher_calculator respectively by cmd.</p>
- <div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="nb">cd</span> /usr/local/src/mersher-b
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="nb">cd</span> /usr/local/src/mersher_calculator
<span class="nb">export </span><span class="nv">SPECIFIC_ADDR</span><span class="o">=</span>127.0.0.1:4540
./mersher
</code></pre>
</div>
- <div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="nb">cd</span> /usr/local/src/mersher-g
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="nb">cd</span> /usr/local/src/mersher_webapp
./mersher
</code></pre>
</div>
</li>
<li>
- <p>5 Use <strong>httpserver</strong> to provide http service. Use <strong>httpserver-gateway</strong> as the client to execute http request to <strong>httpserver</strong>.</p>
+ <p>5 Run <strong>httpserver_webapp</strong>.</p>
- <div class="language-bash highlighter-rouge"><pre class="highlight"><code>go build httpserver.go
-./httpserver.go
-go build httpservergateway.go
-./httpservergateway
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="nb">cd</span> /usr/local/src/httpserver_webapp
+node ./httpserver_webapp.js
</code></pre>
</div>
</li>
<li>
- <p>6 Run <strong>http_server.py</strong> program. You need to install python2.7 and this service relies on BaseHTTPServer package.</p>
+ <p>6 Run <strong>httpserver_calculator</strong> program as BMI calculator. You need to install python2.7 and this service relies on package BaseHTTPServer.</p>
+
+ <div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="nb">cd</span> /usr/local/src/httpserver_calculator
+./httpserver_calculator.py
+</code></pre>
+ </div>
</li>
- <li>7 Use webapp as a user interface which is in <a href="/docs/quick-start.md/"><strong>Bmi-example</strong></a>. Edit http address of the ajax call from /calculator/bmi?height= to <a href=""></a><a href="http://192.168.88.64:4538/bmi?height=">http://192.168.88.64:4538/bmi?height=</a> in static page webapp/src/main/resources/static/index.html. This address is the listening address of the httpservergateway. Update the listening port configuration in application.yaml to 192.168.88.64.</li>
</ul>
<h2 id="start-testing">Start testing</h2>
<ul>
<li>
- <p>1 Open url <a href="http://192.168.88.64:30103">http://192.168.88.64:30103</a> in browser. (If you can’t open it, you need to open the front service of the service-center. Referring <a href="http://servicecomb.apache.org/users/setup-environment/#%E8%BF%90%E8%A1%8Cservice-center">http://servicecomb.apache.org/users/setup-environment/#%E8%BF%90%E8%A1%8Cservice-center</a>). You can see services information in web. The name ‘gateway’ represents the webapp service introduced above whic [...]
+ <p>1 Open url <a href="http://192.168.88.64:30103">http://192.168.88.64:30103</a> in browser(You need to start the front service of the service-center. Referring <a href="http://servicecomb.apache.org/users/setup-environment/#%E8%BF%90%E8%A1%8Cservice-center">http://servicecomb.apache.org/users/setup-environment/#%E8%BF%90%E8%A1%8Cservice-center</a>). You can see services information in web. The name <strong>webapp</strong> represents the <strong>mersher_webapp</strong> which is the [...]
<p><img src="/assets/images/mersher/mersher-servercenter.png" alt="Service-center-monitoring" /></p>
</li>
<li>
- <p>2 Open <a href="http://192.168.88.64:8889">http://192.168.88.64:8889</a> in browser and you can see the following interface.</p>
+ <p>2 Open <a href="http://192.168.88.64:4597">http://192.168.88.64:4597</a> in browser and you can see the following interface.</p>
- <p><img src="/assets/images/mersher/mersher-testinit.png" alt="mersher-bmi-test" /></p>
+ <p><img src="/assets/images/mersher/mersher-testinit.png" alt="mersher_calculatormi-test" /></p>
</li>
<li>
- <p>3 Enter the parameters (180, 70) and click submit to observe change of the BMI Instance ID.</p>
-
- <p><img src="/assets/images/mersher/mersher-testgohttp.png" alt="mersher-testhttp" /><br /></p>
+ <p>3 Enter the parameters (180, 70) and click submit.</p>
<p><img src="/assets/images/mersher/mersher-testpythonhttp.png" alt="mersher-testhttp" /></p>
</li>
@@ -591,7 +574,7 @@ go build httpservergateway.go
<h1 id="whats-next">What’s next</h1>
<ul>
- <li>Read <a href="/docs/mersher-quick-start-advance.md/"><strong>mersher</strong> quick start advance</a></li>
+ <li>Read <a href="/docs/mersher-quick-start-advance/">mersher quick start advance</a></li>
</ul>
diff --git a/content/feed.xml b/content/feed.xml
index 48f743e..45e8ec7 100644
--- a/content/feed.xml
+++ b/content/feed.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" ><generator uri="https://jekyllrb.com/" version="3.4.3">Jekyll</generator><link href="/feed.xml" rel="self" type="application/atom+xml" /><link href="/" rel="alternate" type="text/html" /><updated>2019-08-09T17:42:13+08:00</updated><id>/</id><title type="html">Apache ServiceComb</title><subtitle>The homepage of ServiceComb</subtitle><author><name>{"name"=>nil, "avatar"=>"/assets [...]
+<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" ><generator uri="https://jekyllrb.com/" version="3.4.3">Jekyll</generator><link href="/feed.xml" rel="self" type="application/atom+xml" /><link href="/" rel="alternate" type="text/html" /><updated>2019-08-14T22:33:42+08:00</updated><id>/</id><title type="html">Apache ServiceComb</title><subtitle>The homepage of ServiceComb</subtitle><author><name>{"name"=>nil, "avatar"=>"/assets [...]
<p>基于微服务架构的应用相对于单体架构的应用而言在验收测试阶段具有以下挑战：</p>
diff --git a/content/sitemap.xml b/content/sitemap.xml
index 236baaf..df8114e 100644
--- a/content/sitemap.xml
+++ b/content/sitemap.xml
@@ -578,7 +578,7 @@
</url>
<url>
<loc>/cn/docs/mersher-quick-start-advance/mersher-load-balance/</loc>
-<lastmod>2017-09-03T22:01:43+08:00</lastmod>
+<lastmod>2019-08-08T22:01:43+08:00</lastmod>
</url>
<url>
<loc>/docs/mersher-quick-start-advance/mersher-load-balance/</loc>
[servicecomb-website] 01/02: Merge branch 'master' into asf-site
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git
commit e246dd94a4bfb52efa697ad78b47db7e2f93ab35
Merge: 9a67a3a 00515d6
Author: Willem Jiang <wi...@gmail.com>
AuthorDate: Wed Aug 14 22:33:21 2019 +0800
Merge branch 'master' into asf-site
_docs/cn/mersher-distributed-tracing.md | 10 +-
_docs/cn/mersher-flow-control.md | 4 +-
_docs/cn/mersher-load-balance.md | 29 +++++-
_docs/cn/mersher-quick-start.md | 114 ++++++++++-----------
_docs/cn/mersher-service-management.md | 32 +++---
_docs/mersher-distributed-tracing.md | 10 +-
_docs/mersher-flow-control.md | 4 +-
_docs/mersher-load-balance.md | 25 ++++-
_docs/mersher-quick-start.md | 112 +++++++++-----------
_docs/mersher-service-management.md | 36 ++++---
.../mersher/mersher-circuitbreaker-ret-nil.png | Bin 0 -> 7302 bytes
.../images/mersher/mersher-circuitbreaker-ret.png | Bin 5972 -> 9028 bytes
assets/images/mersher/mersher-circuitbreaker.png | Bin 15220 -> 30583 bytes
.../images/mersher/mersher-deployment-simple.png | Bin 0 -> 51664 bytes
.../images/mersher/mersher-flow-control-fail.png | Bin 26430 -> 6958 bytes
assets/images/mersher/mersher-flowchart-simple.png | Bin 0 -> 23925 bytes
assets/images/mersher/mersher-ser-manage-ver.png | Bin 5934 -> 16442 bytes
assets/images/mersher/mersher-servercenter.png | Bin 31799 -> 28075 bytes
assets/images/mersher/mersher-testinit.png | Bin 29517 -> 30550 bytes
assets/images/mersher/mersher-testpythonhttp2.png | Bin 0 -> 31215 bytes
assets/images/mersher/mersher-tracing-30111.png | Bin 42725 -> 48084 bytes
21 files changed, 198 insertions(+), 178 deletions(-)