From 2f6a1d8f0a4614ff56cac9e5a75c20f2d244c243 Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Fri, 3 Oct 2008 20:56:38 +0000
Subject: Cluster join & brain-dumps working.

cluster: improved join protocol, fixed race conditions.
client/ConnectionHandler,ConnectionImpl: fixed connection close race causing client hang.
src/qpid/sys/PollableQueue.h: fixed incorrect use of startWatch/stopWatch.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@701532 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/xml/cluster.xml | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

(limited to 'qpid/cpp/xml')

diff --git a/qpid/cpp/xml/cluster.xml b/qpid/cpp/xml/cluster.xml
index 1afa08b33e..955f702f5f 100644
--- a/qpid/cpp/xml/cluster.xml
+++ b/qpid/cpp/xml/cluster.xml
@@ -1,4 +1,4 @@
-o<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
 -
 - Licensed to the Apache Software Foundation (ASF) under one
@@ -27,20 +27,25 @@ o<?xml version="1.0"?>
   <class name = "cluster" code = "0x80" label="Qpid clustering extensions.">
     <doc>Qpid extension class to allow clustered brokers to communicate.</doc>
 
-    <control name="update" code="0x1" label="Cluster status update.">
-      <field name="members" type="map"/>     <!-- member-id -> URL -->
-      <field name="dumper" type="uint64"/>   <!-- member currently dumping state. -->
+    <control name="dump-request" code="0x1" label="URL for a member.">
+      <field name="url" type="str16"/>
     </control>
 
-    <control name = "dump-request" code="0x2" label="New meber requests brain dump">
-      <field name="url" type="str16" label="Url for brain dump."/>
+    <control name = "dump-offer" code="0x2" label="Member offering to be dumper for dumpee.">
+      <field name="dumpee" type="uint64"/>
     </control>
 
-    <control name="ready" code="0x3" label="New member is ready.">
-      <field name="url" type="str16" label="Url for brain dump."/>
+    <control name = "dump-start" code="0x3" label="Used internally by dumper to mark stall point.">
+      <field name="dumpee" type="uint64"/>
+      <field name="url" type="str16"/>      
     </control>
 
-    <control name="shutdown" code="0x4" label="Shut down cluster"/>
+
+    <control name="ready" code="0x10" label="New member is ready.">
+      <field name="url" type="str16"/>
+    </control>
+    
+    <control name="shutdown" code="0x20" label="Shut down entire cluster"/>
   </class>
 
   <!-- TODO aconway 2008-09-10: support for un-attached connections. -->
@@ -83,6 +88,9 @@ o<?xml version="1.0"?>
       <field name="connection-id" type="uint64"/>
     </control>
 
-    <control name="dump-complete" code="0x6" label="End of brain dump."/>
+    <control name="membership" code="0x6" label="Cluster membership details.">
+      <field name="newbies" type="map"/> <!-- member-id -> URL -->
+      <field name="members" type="map"/> <!-- member-id -> state -->
+    </control>
   </class>
 </amqp>
-- 
cgit v1.2.1