From c50499e4c309e43367c2ff4ab478d85f88c3124c Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 15 Dec 2010 14:40:01 +0000 Subject: Bug 662765 - Management broker ID should be the same for members of a cluster. Replicate management UUID and name to members of a cluster. See https://bugzilla.redhat.com/show_bug.cgi?id=662765. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1049566 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/cluster/UpdateClient.cpp | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'cpp/src/qpid/cluster/UpdateClient.cpp') diff --git a/cpp/src/qpid/cluster/UpdateClient.cpp b/cpp/src/qpid/cluster/UpdateClient.cpp index 7d73f3c1db..c52caf6aa9 100644 --- a/cpp/src/qpid/cluster/UpdateClient.cpp +++ b/cpp/src/qpid/cluster/UpdateClient.cpp @@ -205,22 +205,12 @@ void UpdateClient::updateManagementSetupState() management::ManagementAgent* agent = updaterBroker.getManagementAgent(); if (!agent) return; - // - // Bash the state of the slave into conformance with ours. The - // goal here is to get his state arranged so as to mimic our - // state, w/r/t object ID creation. Currently, that means that we - // propagate our boot seq and object UID counter to him so that - // subsequently created objects on his side will track what's on - // our side. - // - qmf::org::apache::qpid::broker::ManagementSetupState mss(agent, 0); - mss.set_objectNum(agent->getNextObjectId()); - mss.set_bootSequence(agent->getBootSequence()); - QPID_LOG(debug, updaterId << " updating management-setup-state " - << mss.get_objectNum() - << " " << mss.get_bootSequence() << "\n"); + QPID_LOG(debug, updaterId << " updating management setup-state."); + std::string vendor, product, instance; + agent->getName(vendor, product, instance); ClusterConnectionProxy(session).managementSetupState( - mss.get_objectNum(), mss.get_bootSequence()); + agent->getNextObjectId(), agent->getBootSequence(), agent->getUuid(), + vendor, product, instance); } void UpdateClient::updateManagementAgent() -- cgit v1.2.1