DISPATCH-451: Describe policy setting priority over listener/connector setting
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/c248a34f Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/c248a34f Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/c248a34f Branch: refs/heads/master Commit: c248a34f3d2da46bb7e7e67ccbd04e2340b69f15 Parents: 5f4e4a6 Author: Chuck Rolke <[email protected]> Authored: Mon Oct 3 14:37:40 2016 -0400 Committer: Chuck Rolke <[email protected]> Committed: Mon Oct 3 14:37:40 2016 -0400 ---------------------------------------------------------------------- python/qpid_dispatch/management/qdrouter.json | 17 ++++++++--------- .../management/qdrouter.policyRuleset.settings.txt | 12 ++++++------ 2 files changed, 14 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c248a34f/python/qpid_dispatch/management/qdrouter.json ---------------------------------------------------------------------- diff --git a/python/qpid_dispatch/management/qdrouter.json b/python/qpid_dispatch/management/qdrouter.json index 5b2c347..8113140 100644 --- a/python/qpid_dispatch/management/qdrouter.json +++ b/python/qpid_dispatch/management/qdrouter.json @@ -609,18 +609,18 @@ "maxFrameSize": { "type": "integer", "default": 16384, - "description": "Defaults to 16384. If specified, it is the maximum frame size in octets that will be used in the connection-open negotiation with a connected peer. The frame size is the largest contiguous set of uninterrupted data that can be sent for a message delivery over the connection. Interleaving of messages on different links is done at frame granularity.", + "description": "Defaults to 16384. If specified, it is the maximum frame size in octets that will be used in the connection-open negotiation with a connected peer. The frame size is the largest contiguous set of uninterrupted data that can be sent for a message delivery over the connection. Interleaving of messages on different links is done at frame granularity. Policy settings, if specified, will overwrite this value.", "create": true }, "maxSessions": { "type": "integer", "default": 32768, - "description": "Defaults to 32768. The maximum number of sessions that can be simultaneously active on the connection. Setting this value to zero selects the default number of sessions.", + "description": "Defaults to 32768. The maximum number of sessions that can be simultaneously active on the connection. Setting this value to zero selects the default number of sessions. Policy settings, if specified, will overwrite this value.", "create": true }, "maxSessionWindow": { "type": "integer", - "description": "Incoming window measured in octets for sessions created on this connection. The AMQP negotiated session incoming window, measured in transfers, is calculated to be (maxSessionWindow / maxFrameSize). Setting this value to zero selects the default session window size.", + "description": "Incoming window measured in octets for sessions created on this connection. The AMQP negotiated session incoming window, measured in transfers, is calculated to be (maxSessionWindow / maxFrameSize). Setting this value to zero selects the default session window size. Policy settings, if specified, will overwrite this value.", "default": 1000000, "required": false, "create": true @@ -713,14 +713,13 @@ "required": false, "create": true, "description": "For the 'inter-router' role only. This value assigns a cost metric to the inter-router connection. The default (and minimum) value is one. Higher values represent higher costs. The cost is used to influence the routing algorithm as it attempts to use the path with the lowest total cost from ingress to egress." - }, - + }, "sslProfile": { "type": "string", "required": false, "description": "Name of the sslProfile.", "create": true - }, + }, "saslMechanisms": { "type": "string", "required": false, @@ -736,18 +735,18 @@ "maxFrameSize": { "type": "integer", "default": 65536, - "description": "Maximum frame size in octets that will be used in the connection-open negotiation with a connected peer. The frame size is the largest contiguous set of uninterrupted data that can be sent for a message delivery over the connection. Interleaving of messages on different links is done at frame granularity.", + "description": "Maximum frame size in octets that will be used in the connection-open negotiation with a connected peer. The frame size is the largest contiguous set of uninterrupted data that can be sent for a message delivery over the connection. Interleaving of messages on different links is done at frame granularity. Policy settings, if specified, will overwrite this value.", "create": true }, "maxSessions": { "type": "integer", "default": 32768, - "description": "Defaults to 32768. The maximum number of sessions that can be simultaneously active on the connection. Setting this value to zero selects the default number of sessions.", + "description": "Defaults to 32768. The maximum number of sessions that can be simultaneously active on the connection. Setting this value to zero selects the default number of sessions. Policy settings, if specified, will overwrite this value.", "create": true }, "maxSessionWindow": { "type": "integer", - "description": "Incoming window measured in octets for sessions created on this connection. The AMQP negotiated session incoming window, measured in transfers, is calculated to be (maxSessionWindow / maxFrameSize). Setting this value to zero selects the default session window size.", + "description": "Incoming window measured in octets for sessions created on this connection. The AMQP negotiated session incoming window, measured in transfers, is calculated to be (maxSessionWindow / maxFrameSize). Setting this value to zero selects the default session window size. Policy settings, if specified, will overwrite this value.", "default": 1000000, "required": false, "create": true http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c248a34f/python/qpid_dispatch/management/qdrouter.policyRuleset.settings.txt ---------------------------------------------------------------------- diff --git a/python/qpid_dispatch/management/qdrouter.policyRuleset.settings.txt b/python/qpid_dispatch/management/qdrouter.policyRuleset.settings.txt index 798e146..db85f47 100644 --- a/python/qpid_dispatch/management/qdrouter.policyRuleset.settings.txt +++ b/python/qpid_dispatch/management/qdrouter.policyRuleset.settings.txt @@ -41,29 +41,29 @@ Until the schema is extended specify embedded maps this document describes the v }, "maxFrameSize": { "type": "integer", - "description": "Largest frame that may be sent on this connection. Zero implies system default. (AMQP Open, max-frame-size)", + "description": "Largest frame that may be sent on this connection. Zero implies system default. Policy setting overwrites values specified for a listener or connector. (AMQP Open, max-frame-size)", "default": 65536, "required": false, "create": true }, "maxMessageSize": { "type": "integer", - "description": "Largest message size supported by links created on this connection. Zero implies system default. (AMQP Attach, max-message-size)", + "description": "Largest message size supported by links created on this connection. Zero implies system default. Policy setting overwrites values specified for a listener or connector. (AMQP Attach, max-message-size)", "default": 0, "required": false, "create": true }, "maxSessionWindow": { "type": "integer", - "description": "Largest incoming and outgoing window for sessions created on this connection. Zero implies system default. (AMQP Begin, incoming-window, outgoing-window)", - "default": 2147483647, + "description": "Largest incoming window in octets for sessions created on this connection. Zero implies system default. Policy setting overwrites values specified for a listener or connector. (AMQP Begin, incoming-window)", + "default": 1000000, "required": false, "create": true }, "maxSessions": { "type": "integer", - "description": "Maximum number of sessions that may be created on this connection. Zero implies system default. (AMQP Open, channel-max)", - "default": 2147483647, + "description": "Maximum number of sessions that may be created on this connection. Zero implies system default. Policy setting overwrites values specified for a listener or connector. (AMQP Open, channel-max)", + "default": 32768, "required": false, "create": true }, --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
