QPID-921: applied qpid-patch36.diff on behalf of Ted Ross

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@648308 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 82 insertions, 22 deletions

diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index b9268db9e5..689fb0687c 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -136,7 +136,7 @@ Broker::Broker(const Broker::Options& conf) :
         managementAgent->setInterval (conf.mgmtPubInterval);
         qpid::management::PackageQpid packageInitializer (managementAgent);
 
-        System* system = new System ();
+        System* system = new System (dataDir.isEnabled () ? dataDir.getPath () : string ());
         systemObject = System::shared_ptr (system);
 
         mgmtObject = management::Broker::shared_ptr (new management::Broker (this, system, conf.port));
@@ -149,7 +149,7 @@ Broker::Broker(const Broker::Options& conf) :
         mgmtObject->set_dataDirEnabled   (dataDir.isEnabled ());
         mgmtObject->set_dataDir          (dataDir.getPath ());
         
-        managementAgent->addObject (mgmtObject, 1, 0);
+        managementAgent->addObject (mgmtObject, 1, 1);
 
         // Since there is currently no support for virtual hosts, a placeholder object
         // representing the implied single virtual host is added here to keep the
diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp
index 591e9796d6..b3d8fda53b 100644
--- a/cpp/src/qpid/broker/Queue.cpp
+++ b/cpp/src/qpid/broker/Queue.cpp
@@ -69,7 +69,7 @@ Queue::Queue(const string& _name, bool _autodelete,
         if (agent.get () != 0)
         {
             mgmtObject = management::Queue::shared_ptr
-                (new management::Queue (this, parent, _name, _store != 0, _autodelete, 0));
+                (new management::Queue (this, parent, _name, _store != 0, _autodelete, _owner != 0));
 
             // Add the object to the management agent only if this queue is not durable.
             // If it's durable, we will add it later when the queue is assigned a persistenceId.
diff --git a/cpp/src/qpid/broker/System.cpp b/cpp/src/qpid/broker/System.cpp
index 87d5185b97..33a9db46a2 100644
--- a/cpp/src/qpid/broker/System.cpp
+++ b/cpp/src/qpid/broker/System.cpp
@@ -19,19 +19,51 @@
 
 #include "System.h"
 #include "qpid/management/ManagementAgent.h"
+#include "qpid/framing/Uuid.h"
 #include <sys/utsname.h>
+#include <iostream>
+#include <fstream>
 
-using namespace qpid::broker;
 using qpid::management::ManagementAgent;
+using namespace qpid::broker;
+using namespace std;
 
-System::System ()
+System::System (string _dataDir)
 {
     ManagementAgent::shared_ptr agent = ManagementAgent::getAgent ();
 
     if (agent.get () != 0)
     {
+        framing::Uuid systemId;
+
+        if (_dataDir.empty ())
+        {
+            systemId.generate ();
+        }
+        else
+        {
+            string   filename (_dataDir + "/systemId");
+            ifstream inFile (filename.c_str ());
+
+            if (inFile.good ())
+            {
+                inFile >> systemId;
+                inFile.close ();
+            }
+            else
+            {
+                systemId.generate ();
+                ofstream outFile (filename.c_str ());
+                if (outFile.good ())
+                {
+                    outFile << systemId << endl;
+                    outFile.close ();
+                }
+            }
+        }
+
         mgmtObject = management::System::shared_ptr
-            (new management::System (this, "host"));
+            (new management::System (this, systemId));
         struct utsname _uname;
         if (uname (&_uname) == 0)
         {
@@ -42,7 +74,7 @@ System::System ()
             mgmtObject->set_machine  (std::string (_uname.machine));
         }
 
-        agent->addObject (mgmtObject, 3, 0);
+        agent->addObject (mgmtObject, 3, 1);
     }
 }
 
diff --git a/cpp/src/qpid/broker/System.h b/cpp/src/qpid/broker/System.h
index a1a710f2b2..0d63bd1b3d 100644
--- a/cpp/src/qpid/broker/System.h
+++ b/cpp/src/qpid/broker/System.h
@@ -23,6 +23,7 @@
 #include "qpid/management/Manageable.h"
 #include "qpid/management/System.h"
 #include <boost/shared_ptr.hpp>
+#include <string>
 
 namespace qpid { 
 namespace broker {
@@ -37,7 +38,7 @@ class System : public management::Manageable
 
     typedef boost::shared_ptr<System> shared_ptr;
 
-    System ();
+    System (std::string _dataDir);
 
     management::ManagementObject::shared_ptr GetManagementObject (void) const
     { return mgmtObject; }
diff --git a/cpp/src/qpid/broker/Vhost.cpp b/cpp/src/qpid/broker/Vhost.cpp
index 06a8c8eca3..c2c7e985b4 100644
--- a/cpp/src/qpid/broker/Vhost.cpp
+++ b/cpp/src/qpid/broker/Vhost.cpp
@@ -33,7 +33,7 @@ Vhost::Vhost (management::Manageable* parentBroker)
         {
             mgmtObject = management::Vhost::shared_ptr
                 (new management::Vhost (this, parentBroker, "/"));
-            agent->addObject (mgmtObject, 2, 0);
+            agent->addObject (mgmtObject, 2, 1);
         }
     }
 }
diff --git a/cpp/src/qpid/management/ManagementAgent.cpp b/cpp/src/qpid/management/ManagementAgent.cpp
index ee0eb27bf6..cace04bef5 100644
--- a/cpp/src/qpid/management/ManagementAgent.cpp
+++ b/cpp/src/qpid/management/ManagementAgent.cpp
@@ -42,20 +42,24 @@ ManagementAgent::ManagementAgent (string _dataDir, uint16_t _interval) :
     dataDir (_dataDir), interval (_interval)
 {
     timer.add (intrusive_ptr<TimerTask> (new Periodic(*this, interval)));
-    nextObjectId = uint64_t (qpid::sys::Duration (qpid::sys::now ()));
+    localBank        = 3;
+    nextObjectId     = 1;
     nextRemotePrefix = 101;
 
     // Get from file or generate and save to file.
     if (dataDir.empty ())
     {
         uuid.generate ();
+        bootSequence = 1;
         QPID_LOG (info, "ManagementAgent has no data directory, generated new broker ID: "
                   << uuid);
     }
     else
     {
-        string   filename (dataDir + "/brokerId");
-        ifstream inFile   (filename.c_str ());
+        string   filename    (dataDir + "/brokerId");
+        string   seqFilename (dataDir + "/bootseq");
+        ifstream inFile      (filename.c_str ());
+        ifstream seqFile     (seqFilename.c_str ());
 
         if (inFile.good ())
         {
@@ -80,6 +84,26 @@ ManagementAgent::ManagementAgent (string _dataDir, uint16_t _interval) :
                 QPID_LOG (warning, "ManagementAgent unable to save broker ID");
             }
         }
+
+        if (seqFile.good ())
+        {
+            seqFile >> bootSequence;
+            seqFile.close ();
+        }
+        else
+            bootSequence = 1;
+
+        ofstream seqOut (seqFilename.c_str ());
+        if (seqOut.good ())
+        {
+            uint16_t nextSeq = (bootSequence + 1) & 0x7FFF;
+            if (nextSeq == 0)
+                nextSeq = 1;
+            seqOut << nextSeq << endl;
+            seqOut.close ();
+        }
+
+        QPID_LOG (debug, "ManagementAgent boot sequence: " << bootSequence);
     }
 }
 
@@ -125,16 +149,17 @@ void ManagementAgent::RegisterClass (string   packageName,
 }
 
 void ManagementAgent::addObject (ManagementObject::shared_ptr object,
-                                 uint64_t                     /*persistenceId*/,
-                                 uint64_t                     /*idOffset*/)
+                                 uint32_t                     persistId,
+                                 uint32_t                     persistBank)
 {
     Mutex::ScopedLock lock (userLock);
     uint64_t objectId;
 
-//    if (persistenceId == 0)
-        objectId = nextObjectId++;
-//    else
-//        objectId = 0x8000000000000000ULL | (persistenceId + idOffset);
+    if (persistId == 0)
+        objectId = ((uint64_t) bootSequence) << 48 |
+            ((uint64_t) localBank) << 24 | nextObjectId++;
+    else
+        objectId = ((uint64_t) persistBank) << 24 | persistId;
 
     object->setObjectId (objectId);
     managementObjects[objectId] = object;
@@ -384,7 +409,7 @@ void ManagementAgent::dispatchMethod (Message&      msg,
     EncodeHeader (outBuffer, 'm', sequence);
 
     ManagementObjectMap::iterator iter = managementObjects.find (objId);
-    if (iter == managementObjects.end ())
+    if (iter == managementObjects.end () || iter->second->isDeleted ())
     {
         outBuffer.putLong        (Manageable::STATUS_UNKNOWN_OBJECT);
         outBuffer.putShortString (Manageable::StatusText (Manageable::STATUS_UNKNOWN_OBJECT));
diff --git a/cpp/src/qpid/management/ManagementAgent.h b/cpp/src/qpid/management/ManagementAgent.h
index bd86d4e773..4cd679a035 100644
--- a/cpp/src/qpid/management/ManagementAgent.h
+++ b/cpp/src/qpid/management/ManagementAgent.h
@@ -58,8 +58,8 @@ class ManagementAgent
                           uint8_t*    md5Sum,
                           ManagementObject::writeSchemaCall_t schemaCall);
     void addObject       (ManagementObject::shared_ptr object,
-                          uint64_t                     persistenceId = 0,
-                          uint64_t                     idOffset      = 10);
+                          uint32_t                     persistId   = 0,
+                          uint32_t                     persistBank = 2);
     void clientAdded     (void);
     void dispatchCommand (broker::Deliverable&             msg,
                           const std::string&               routingKey,
@@ -142,7 +142,9 @@ class ManagementAgent
     broker::Exchange::shared_ptr dExchange;
     std::string                  dataDir;
     uint16_t                     interval;
-    uint64_t                     nextObjectId;
+    uint16_t                     bootSequence;
+    uint32_t                     localBank;
+    uint32_t                     nextObjectId;
     uint32_t                     nextRemotePrefix;
 
 #   define MA_BUFFER_SIZE 65536