qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject svn commit: r1529198 - in /qpid/trunk/qpid: cpp/src/qpid/client/ cpp/src/tests/ doc/book/src/cpp-broker/ tools/src/py/
Date Fri, 04 Oct 2013 15:52:49 GMT
Author: aconway
Date: Fri Oct  4 15:52:48 2013
New Revision: 1529198

URL: http://svn.apache.org/r1529198
Log:
QPID-5197: Remove obsolete --cluster-durable/persistLastNode options in C++ and python.

Modified:
    qpid/trunk/qpid/cpp/src/qpid/client/QueueOptions.cpp
    qpid/trunk/qpid/cpp/src/qpid/client/QueueOptions.h
    qpid/trunk/qpid/cpp/src/tests/QueueOptionsTest.cpp
    qpid/trunk/qpid/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Queue-Options.xml
    qpid/trunk/qpid/doc/book/src/cpp-broker/Managing-CPP-Broker.xml
    qpid/trunk/qpid/tools/src/py/qpid-config

Modified: qpid/trunk/qpid/cpp/src/qpid/client/QueueOptions.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/QueueOptions.cpp?rev=1529198&r1=1529197&r2=1529198&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/QueueOptions.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/QueueOptions.cpp Fri Oct  4 15:52:48 2013
@@ -38,7 +38,6 @@ const std::string QueueOptions::strFLOW_
 const std::string QueueOptions::strRING("ring");
 const std::string QueueOptions::strRING_STRICT("ring_strict");
 const std::string QueueOptions::strLastValueQueue("qpid.last_value_queue");
-const std::string QueueOptions::strPersistLastNode("qpid.persist_last_node");
 const std::string QueueOptions::strLVQMatchProperty("qpid.LVQ_key");
 const std::string QueueOptions::strLastValueQueueNoBrowse("qpid.last_value_queue_no_browse");
 const std::string QueueOptions::strQueueEventMode("qpid.queue_event_generation");
@@ -74,11 +73,6 @@ void QueueOptions::setSizePolicy(QueueSi
 }
 
 
-void QueueOptions::setPersistLastNode()
-{
-    setInt(strPersistLastNode, 1);
-}
-
 void QueueOptions::setOrdering(QueueOrderingPolicy op)
 {
     if (op == LVQ){
@@ -102,11 +96,6 @@ void QueueOptions::clearSizePolicy()
     erase(strTypeKey);
 }
 
-void QueueOptions::clearPersistLastNode()
-{
-    erase(strPersistLastNode);
-}
-
 void QueueOptions::clearOrdering()
 {
     erase(strLastValueQueue);

Modified: qpid/trunk/qpid/cpp/src/qpid/client/QueueOptions.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/QueueOptions.h?rev=1529198&r1=1529197&r2=1529198&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/QueueOptions.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/QueueOptions.h Fri Oct  4 15:52:48 2013
@@ -56,12 +56,6 @@ class QPID_CLIENT_CLASS_EXTERN QueueOpti
     QPID_CLIENT_EXTERN void setSizePolicy(QueueSizePolicy sp, uint64_t maxSize, uint32_t
maxCount );
 
     /**
-     * Enables the persisting of a queue to the store module when a cluster fails down to
it's last
-     * node. Does so optimistically. Will start persisting when cluster count >1 again.
-     */
-    QPID_CLIENT_EXTERN void setPersistLastNode();
-
-    /**
      * Sets the odering policy on the Queue, default ordering is FIFO.
      */
     QPID_CLIENT_EXTERN void setOrdering(QueueOrderingPolicy op);
@@ -72,11 +66,6 @@ class QPID_CLIENT_CLASS_EXTERN QueueOpti
     QPID_CLIENT_EXTERN void clearSizePolicy();
 
     /**
-     * Clear Persist Last Node Policy
-     */
-    QPID_CLIENT_EXTERN void clearPersistLastNode();
-
-    /**
      * get the key used match LVQ in args for message transfer
      */
     QPID_CLIENT_EXTERN void getLVQKey(std::string& key);
@@ -116,7 +105,6 @@ class QPID_CLIENT_CLASS_EXTERN QueueOpti
     static QPID_CLIENT_EXTERN const std::string strRING;
     static QPID_CLIENT_EXTERN const std::string strRING_STRICT;
     static QPID_CLIENT_EXTERN const std::string strLastValueQueue;
-    static QPID_CLIENT_EXTERN const std::string strPersistLastNode;
     static QPID_CLIENT_EXTERN const std::string strLVQMatchProperty;
     static QPID_CLIENT_EXTERN const std::string strLastValueQueueNoBrowse;
     static QPID_CLIENT_EXTERN const std::string strQueueEventMode;

Modified: qpid/trunk/qpid/cpp/src/tests/QueueOptionsTest.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/QueueOptionsTest.cpp?rev=1529198&r1=1529197&r2=1529198&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/QueueOptionsTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/QueueOptionsTest.cpp Fri Oct  4 15:52:48 2013
@@ -63,16 +63,9 @@ QPID_AUTO_TEST_CASE(testFlags)
 {
     QueueOptions ft;
 
-    ft.setPersistLastNode();
     ft.setOrdering(LVQ);
-
-    BOOST_CHECK(1 == ft.getAsInt(QueueOptions::strPersistLastNode));
     BOOST_CHECK(1 == ft.getAsInt(QueueOptions::strLastValueQueue));
-
-    ft.clearPersistLastNode();
     ft.setOrdering(FIFO);
-
-    BOOST_CHECK(!ft.isSet(QueueOptions::strPersistLastNode));
     BOOST_CHECK(!ft.isSet(QueueOptions::strLastValueQueue));
 
 }
@@ -87,16 +80,6 @@ QPID_AUTO_TEST_CASE(testSetOrdering)
 
 }
 
-QPID_AUTO_TEST_CASE(testClearPersistLastNode)
-{
-    //ensure clear works even if not preceded by the setting on the
-    //option
-    QueueOptions ft;
-    ft.clearPersistLastNode();
-    BOOST_CHECK(!ft.isSet(QueueOptions::strPersistLastNode));
-}
-
-
 QPID_AUTO_TEST_SUITE_END()
 
 }} // namespace qpid::tests

Modified: qpid/trunk/qpid/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Queue-Options.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Queue-Options.xml?rev=1529198&r1=1529197&r2=1529198&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Queue-Options.xml
(original)
+++ qpid/trunk/qpid/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Queue-Options.xml
Fri Oct  4 15:52:48 2013
@@ -52,9 +52,6 @@
                   <listitem><para>
                     <itemizedlist>
                       <listitem><para>
-                        <xref linkend="CheatSheetforconfiguringQueueOptions-PersistLastNode"/>
-                      </para></listitem>
-                      <listitem><para>
                         <xref linkend="CheatSheetforconfiguringQueueOptions-Queueeventgeneration"/>
                       </para></listitem>
                     </itemizedlist>
@@ -182,37 +179,6 @@
 	  <section role="h3" id="CheatSheetforconfiguringQueueOptions-Settingadditionalbehaviors"><title>
             Setting additional behaviors
           </title>
-          <section role="h4" id="CheatSheetforconfiguringQueueOptions-PersistLastNode"><title>
-            Persist
-            Last Node
-          </title>
-          <para>
-            This option is used in conjunction with clustering. It allows for
-            a queue configured with this option to persist transient messages
-            if the cluster fails down to the last node. If additional nodes
-            in the cluster are restored it will stop persisting transient
-            messages.
-          </para><para>
-            Note
-          </para><itemizedlist>
-            <listitem><para>if a cluster is started with only one active node,
this mode
-            will not be triggered. It is only triggered the first time the
-            cluster fails down to 1 node.
-            </para></listitem>
-            <listitem><para>The queue MUST be configured durable
-            </para></listitem>
-          </itemizedlist><para>
-            Example:
-          </para>
-            <programlisting>
-#include "qpid/client/QueueOptions.h"
-
-    QueueOptions qo;
-    qo.clearPersistLastNode();
-
-    session.queueDeclare(arg::queue=queue, arg::durable=true, arg::arguments=qo);
-</programlisting>
-	  <!--h4--></section>
           <section role="h4" id="CheatSheetforconfiguringQueueOptions-Queueeventgeneration"><title>
             Queue
             event generation

Modified: qpid/trunk/qpid/doc/book/src/cpp-broker/Managing-CPP-Broker.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/cpp-broker/Managing-CPP-Broker.xml?rev=1529198&r1=1529197&r2=1529198&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/cpp-broker/Managing-CPP-Broker.xml (original)
+++ qpid/trunk/qpid/doc/book/src/cpp-broker/Managing-CPP-Broker.xml Fri Oct  4 15:52:48 2013
@@ -70,7 +70,6 @@ Options:
 
 Add Queue Options:
     --durable            Queue is durable
-    --cluster-durable    Queue becomes durable if there is only one functioning cluster node
     --file-count N (8)   Number of files in queue's persistence journal
     --file-size  N (24)  File size in pages (64Kib/page)
     --max-queue-size N   Maximum in-memory queue size as bytes

Modified: qpid/trunk/qpid/tools/src/py/qpid-config
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/py/qpid-config?rev=1529198&r1=1529197&r2=1529198&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/py/qpid-config (original)
+++ qpid/trunk/qpid/tools/src/py/qpid-config Fri Oct  4 15:52:48 2013
@@ -86,7 +86,6 @@ class Config:
         self._altern_ex         = None
         self._durable           = False
         self._replicate       = None
-        self._clusterDurable    = False
         self._if_empty          = True
         self._if_unused         = True
         self._fileCount         = None
@@ -117,7 +116,6 @@ FILESIZE  = "qpid.file_size"
 MAX_QUEUE_SIZE  = "qpid.max_size"
 MAX_QUEUE_COUNT  = "qpid.max_count"
 POLICY_TYPE  = "qpid.policy_type"
-CLUSTER_DURABLE = "qpid.persist_last_node"
 LVQ_KEY = "qpid.last_value_queue_key"
 MSG_SEQUENCE = "qpid.msg_sequence"
 IVE = "qpid.ive"
@@ -136,7 +134,7 @@ REPLICATE = "qpid.replicate"
 #i.e. the arguments for which there is special processing on add and
 #list
 SPECIAL_ARGS=[
-    FILECOUNT,FILESIZE,MAX_QUEUE_SIZE,MAX_QUEUE_COUNT,POLICY_TYPE,CLUSTER_DURABLE,
+    FILECOUNT,FILESIZE,MAX_QUEUE_SIZE,MAX_QUEUE_COUNT,POLICY_TYPE,
     LVQ_KEY,MSG_SEQUENCE,IVE,QUEUE_EVENT_GENERATION,
     FLOW_STOP_COUNT,FLOW_RESUME_COUNT,FLOW_STOP_SIZE,FLOW_RESUME_SIZE,
     MSG_GROUP_HDR_KEY,SHARED_MSG_GROUP,REPLICATE]
@@ -191,7 +189,6 @@ def OptionsAndArguments(argv):
     parser.add_option_group(group2)
 
     group3 = OptionGroup(parser, "Options for Adding Queues")
-    group3.add_option("--cluster-durable", action="store_true", help="The new queue becomes
durable if there is only one functioning cluster node")
     group3.add_option("--file-count", action="store", type="int", metavar="<n>", help="Number
of files in queue's persistence journal")
     group3.add_option("--file-size", action="store", type="int", metavar="<n>", help="File
size in pages (64KiB/page)")
     group3.add_option("--max-queue-size", action="store", type="int", metavar="<n>",
help="Maximum in-memory queue size as bytes")
@@ -262,8 +259,6 @@ def OptionsAndArguments(argv):
             raise Exception("Invalid replication level '%s', should be one of: %s" % (opts.replicate,
", ".join(REPLICATE_LEVELS)))
         config._replicate = opts.replicate
     if opts.ha_admin: config._ha_admin = True
-    if opts.cluster_durable:
-        config._clusterDurable = True
     if opts.file:
         config._file = opts.file
     if opts.file_count is not None:
@@ -494,7 +489,6 @@ class BrokerManager:
                 if not args: args = {}
                 if q.durable:    print "--durable",
                 if REPLICATE in args: print "--replicate=%s" % args[REPLICATE],
-                if CLUSTER_DURABLE in args and args[CLUSTER_DURABLE] == 1: print "--cluster-durable",
                 if q.autoDelete: print "auto-del",
                 if q.exclusive:  print "excl",
                 if FILESIZE in args: print "--file-size=%s" % args[FILESIZE],
@@ -598,8 +592,6 @@ class BrokerManager:
             elif config._limitPolicy == "ring":
                 declArgs[POLICY_TYPE] = "ring"
 
-        if config._clusterDurable:
-            declArgs[CLUSTER_DURABLE] = 1
         if config._lvq_key:
             declArgs[LVQ_KEY] = config._lvq_key
         if config._eventGeneration:



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message