From da00c6a28b4df6e2618cff17f952012f7d76c10c Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Fri, 5 Feb 2010 23:02:45 +0000
Subject: Consistent connection names across a cluster.

- use the same host:port for connections and their shadows.
- add shadow property to managment connection to identify shadows.
- updated qpid-stat and qpid-cluster to filter on shadow property.


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@907123 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/xml/cluster.xml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'qpid/cpp/xml')

diff --git a/qpid/cpp/xml/cluster.xml b/qpid/cpp/xml/cluster.xml
index a879d5137b..44f055ea32 100644
--- a/qpid/cpp/xml/cluster.xml
+++ b/qpid/cpp/xml/cluster.xml
@@ -117,6 +117,7 @@
 
     <!-- Announce a new connection -->
     <control name="announce" code="0x1">
+      <field name="management-id" type="str16"/>
       <!-- Security Strength Factor (ssf): if the transport provides
       encryption (e.g. ssl), ssf is the bit length of the key.  Zero if no
       encryption provided. -->
@@ -135,13 +136,18 @@
     <control name="abort" code="0x4"/>
     
     <!-- Update controls. Sent to a new broker in joining mode.
-	 A connection is updateed as followed:
-	 - open as a normal connection.
+	 A connection is updated as followed:
+	 - send the shadow's management ID in shadow-perpare on the update connection
+	 - open the shadow as a normal connection.
 	 - attach sessions, create consumers, set flow with normal AMQP cokmmands.
 	 - send /reset additional session state with controls below.
 	 - send shadow-ready to mark end of shadow update.
 	 - send membership when entire update is complete.
     -->
+    <!-- Prepare to send a shadow connection with the given ID. -->
+    <control name="shadow-prepare" code="0x0F">
+      <field name="management-id" type="str16"/>
+    </control>
     
     <!-- Consumer state that cannot be set by standard AMQP controls. -->
     <control name="consumer-state" code="0x10">
@@ -202,6 +208,7 @@
     <control name="shadow-ready" code="0x20" label="End of shadow connection update.">
       <field name="member-id" type="uint64"/>
       <field name="connection-id" type="uint64"/>
+      <field name="management-id" type="str16"/>
       <field name="user-name" type="str8"/>
       <field name="fragment" type="str32"/>
       <field name="send-max" type="uint32"/>
-- 
cgit v1.2.1