This is an automated email from the ASF dual-hosted git repository.
bhardesty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/master by this push:
new 260ef1b NO-JIRA: Update diagram styles and add new link routing
example diagram. This closes #709.
260ef1b is described below
commit 260ef1b63e5b7091aeb6cde7d868e4c94f983c4b
Author: Ben Hardesty <bhard...@redhat.com>
AuthorDate: Wed Mar 25 15:37:05 2020 -0400
NO-JIRA: Update diagram styles and add new link routing example diagram.
This closes #709.
---
docs/books/images/balanced-routing.png | Bin 43261 -> 45011 bytes
docs/books/images/brokered-messaging.png | Bin 50206 -> 51468 bytes
docs/books/images/closest-routing.png | Bin 39803 -> 42896 bytes
docs/books/images/link-routing-02.png | Bin 0 -> 52925 bytes
docs/books/images/link-routing.png | Bin 46968 -> 49243 bytes
docs/books/images/message-routing.png | Bin 35861 -> 35011 bytes
docs/books/images/multicast-routing.png | Bin 44923 -> 48504 bytes
docs/books/images/path-redundancy-01.png | Bin 47995 -> 44907 bytes
docs/books/images/path-redundancy-02.png | Bin 42131 -> 40277 bytes
.../images/path-redundancy-temp-decoupling-01.png | Bin 47766 -> 44995 bytes
.../images/path-redundancy-temp-decoupling-02.png | Bin 49105 -> 44956 bytes
docs/books/images/peer-to-peer-comm.png | Bin 0 -> 20590 bytes
docs/books/images/sharded-queue-01.png | Bin 28383 -> 31229 bytes
docs/books/images/sharded-queue-02.png | Bin 62233 -> 67415 bytes
.../modules/user-guide/link-route-example.adoc | 43 ++++++---------------
15 files changed, 11 insertions(+), 32 deletions(-)
diff --git a/docs/books/images/balanced-routing.png
b/docs/books/images/balanced-routing.png
index fedcdbf..3c2e018 100644
Binary files a/docs/books/images/balanced-routing.png and
b/docs/books/images/balanced-routing.png differ
diff --git a/docs/books/images/brokered-messaging.png
b/docs/books/images/brokered-messaging.png
index ae129d4..3f1ea7c 100644
Binary files a/docs/books/images/brokered-messaging.png and
b/docs/books/images/brokered-messaging.png differ
diff --git a/docs/books/images/closest-routing.png
b/docs/books/images/closest-routing.png
index ba3f0a5..72d398f 100644
Binary files a/docs/books/images/closest-routing.png and
b/docs/books/images/closest-routing.png differ
diff --git a/docs/books/images/link-routing-02.png
b/docs/books/images/link-routing-02.png
new file mode 100644
index 0000000..2389485
Binary files /dev/null and b/docs/books/images/link-routing-02.png differ
diff --git a/docs/books/images/link-routing.png
b/docs/books/images/link-routing.png
index 0c1b9e4..20a1cb6 100644
Binary files a/docs/books/images/link-routing.png and
b/docs/books/images/link-routing.png differ
diff --git a/docs/books/images/message-routing.png
b/docs/books/images/message-routing.png
index 42f4638..3943110 100644
Binary files a/docs/books/images/message-routing.png and
b/docs/books/images/message-routing.png differ
diff --git a/docs/books/images/multicast-routing.png
b/docs/books/images/multicast-routing.png
index d4548a6..9ea83f1 100644
Binary files a/docs/books/images/multicast-routing.png and
b/docs/books/images/multicast-routing.png differ
diff --git a/docs/books/images/path-redundancy-01.png
b/docs/books/images/path-redundancy-01.png
index ba8f10d..be59462 100644
Binary files a/docs/books/images/path-redundancy-01.png and
b/docs/books/images/path-redundancy-01.png differ
diff --git a/docs/books/images/path-redundancy-02.png
b/docs/books/images/path-redundancy-02.png
index 6d4a1f5..e02fedc 100644
Binary files a/docs/books/images/path-redundancy-02.png and
b/docs/books/images/path-redundancy-02.png differ
diff --git a/docs/books/images/path-redundancy-temp-decoupling-01.png
b/docs/books/images/path-redundancy-temp-decoupling-01.png
index c3c6631..9a6abec 100644
Binary files a/docs/books/images/path-redundancy-temp-decoupling-01.png and
b/docs/books/images/path-redundancy-temp-decoupling-01.png differ
diff --git a/docs/books/images/path-redundancy-temp-decoupling-02.png
b/docs/books/images/path-redundancy-temp-decoupling-02.png
index ecab8b1..5d06e8c 100644
Binary files a/docs/books/images/path-redundancy-temp-decoupling-02.png and
b/docs/books/images/path-redundancy-temp-decoupling-02.png differ
diff --git a/docs/books/images/peer-to-peer-comm.png
b/docs/books/images/peer-to-peer-comm.png
new file mode 100644
index 0000000..59978a1
Binary files /dev/null and b/docs/books/images/peer-to-peer-comm.png differ
diff --git a/docs/books/images/sharded-queue-01.png
b/docs/books/images/sharded-queue-01.png
index ab25be0..14bd426 100644
Binary files a/docs/books/images/sharded-queue-01.png and
b/docs/books/images/sharded-queue-01.png differ
diff --git a/docs/books/images/sharded-queue-02.png
b/docs/books/images/sharded-queue-02.png
index 7e73e6d..96ea028 100644
Binary files a/docs/books/images/sharded-queue-02.png and
b/docs/books/images/sharded-queue-02.png differ
diff --git a/docs/books/modules/user-guide/link-route-example.adoc
b/docs/books/modules/user-guide/link-route-example.adoc
index 0b2c708..a1d27b9 100644
--- a/docs/books/modules/user-guide/link-route-example.adoc
+++ b/docs/books/modules/user-guide/link-route-example.adoc
@@ -27,43 +27,22 @@ under the License
This example shows how a link route can connect a client to a message broker
that is on a different private network.
.Router network with isolated clients
-----
-
- Public Network
- +-----------------+
- | +-----+ |
- | B1 | Rp | |
- | +/--\-+ |
- | / \ |
- | / \ |
- +----/--------\---+
- / \
- / \
- / \
- Private Net A / \ Private Net B
- +--------------/--+ +---\-------------+
- | +---/-+ | | +--\--+ |
- | B2 | Ra | | | | Rb | C1 |
- | +-----+ | | +-----+ |
- | | | |
- | | | |
- +-----------------+ +-----------------+
-----
+image::link-routing-02.png[Network isolation with link routing, align="center"]
-Client `C1` is constrained by firewall policy to connect to the router in its
own network (`Rb`). However, it can use a link route to access queues, topics,
and any other AMQP services that are provided on message brokers `B1` and `B2`
-- even though they are on different networks.
+The client is constrained by firewall policy to connect to the router in its
own network (`R3`). However, it can use a link route to access queues, topics,
and any other AMQP services that are provided on message brokers `B1` and `B2`
-- even though they are on different networks.
-In this example, client `C1` needs to receive messages from `b2.event-queue`,
which is hosted on broker `B2` in `Private Net A`. A link route connects the
client and broker even though neither of them is aware that there is a router
network between them.
+In this example, the client needs to receive messages from `b2.event-queue`,
which is hosted on broker `B2` in `Private Network 1`. A link route connects
the client and broker even though neither of them is aware that there is a
router network between them.
[discrete]
== Router configuration
-To enable client `C1` to receive messages from `b2.event-queue` on broker
`B2`, router `Ra` must be able to do the following:
+To enable the client to receive messages from `b2.event-queue` on broker `B2`,
router `R2` must be able to do the following:
* Connect to broker `B2`
* Route links to and from broker `B2`
* Advertise itself to the router network as a valid destination for links that
have a `b2.event-queue` address
-The relevant part of the configuration file for router `Ra` shows the
following:
+The relevant part of the configuration file for router `R2` shows the
following:
--
[options="nowrap"]
@@ -93,23 +72,23 @@ linkRoute { // <3>
<3> The outgoing link route for sending links to client receivers. Any
receivers whose source address begins with `b2` will be routed to broker `B2`
using the `broker` connector.
--
-This configuration enables router `Ra` to advertise itself as a valid
destination for targets and sources starting with `b2`. It also enables the
router to connect to broker `B2`, and to route links to and from queues
starting with the `b2` prefix.
+This configuration enables router `R2` to advertise itself as a valid
destination for targets and sources starting with `b2`. It also enables the
router to connect to broker `B2`, and to route links to and from queues
starting with the `b2` prefix.
[NOTE]
====
-While not required, routers `Rp` and `Rb` should also have the same
configuration.
+While not required, routers `R1` and `R3` should also have the same
configuration.
====
[discrete]
== How the client receives messages
-By using the configured link route, client `C1` can receive messages from
broker `B2` even though they are on different networks.
+By using the configured link route, the client can receive messages from
broker `B2` even though they are on different networks.
-Router `Ra` establishes a connection to broker `B2`. Once the connection is
open, `Ra` tells the other routers (`Rp` and `Rb`) that it is a valid
destination for link routes to the `b2` prefix. This means that sender and
receiver links attached to `Rb` or `Rp` will be routed along the shortest path
to `Ra`, which then routes them to broker `B2`.
+Router `R2` establishes a connection to broker `B2`. Once the connection is
open, `R2` tells the other routers (`R1` and `R3`) that it is a valid
destination for link routes to the `b2` prefix. This means that sender and
receiver links attached to `R1` or `R3` will be routed along the shortest path
to `R2`, which then routes them to broker `B2`.
-To receive messages from the `b2.event-queue` on broker `B2`, client `C1`
attaches a receiver link with a source address of `b2.event-queue` to its local
router, `Rb`. Because the address matches the `b2` prefix, `Rb` routes the link
to `Rp`, which is the next hop in the route to its destination. `Rp` routes the
link to `Ra`, which routes it to broker `B2`. Client `C1` now has a receiver
established, and it can begin receiving messages.
+To receive messages from the `b2.event-queue` on broker `B2`, the client
attaches a receiver link with a source address of `b2.event-queue` to its local
router, `R3`. Because the address matches the `b2` prefix, `R3` routes the link
to `R1`, which is the next hop in the route to its destination. `R1` routes the
link to `R2`, which routes it to broker `B2`. The client now has a receiver
established, and it can begin receiving messages.
[NOTE]
====
-If broker `B2` is unavailable for any reason, router `Ra` will not advertise
itself as a destination for `b2` addresses. In this case, routers `Rb` and `Rp`
will reject link attaches that should be routed to broker `B2` with an error
message indicating that there is no route available to the destination.
+If broker `B2` is unavailable for any reason, router `R2` will not advertise
itself as a destination for `b2` addresses. In this case, routers `R1` and `R3`
will reject link attaches that should be routed to broker `B2` with an error
message indicating that there is no route available to the destination.
====
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
