Repository: qpid-broker-j Updated Branches: refs/heads/master 593d15778 -> 54b58c603
QPID-7639: Correct participle flown => flowed in code and documentation Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/54b58c60 Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/54b58c60 Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/54b58c60 Branch: refs/heads/master Commit: 54b58c603acc88cf3bbbdb20fd71cefc159c2546 Parents: 593d157 Author: Keith Wall <[email protected]> Authored: Thu May 4 08:32:07 2017 +0100 Committer: Keith Wall <[email protected]> Committed: Thu May 4 08:32:07 2017 +0100 ---------------------------------------------------------------------- .../qpid/server/logging/messages/ConnectionMessages.java | 2 +- .../logging/messages/Connection_logmessages.properties | 2 +- .../java/org/apache/qpid/server/model/Connection.java | 4 ++-- .../Java-Broker-Appendix-Operational-Logging-Messages.xml | 2 +- .../src/docbkx/runtime/Java-Broker-Runtime-Memory.xml | 10 +++++----- 5 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54b58c60/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java ---------------------------------------------------------------------- diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java index 8f0b144..b1d4c39 100644 --- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java +++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java @@ -505,7 +505,7 @@ public class ConnectionMessages /** * Log a Connection message of the Format: - * <pre>CON-1009 : Uncommitted transaction(s) contains {0,number} bytes of incoming message data exceeding {1,number} bytes limit. Messages will be flown to disk.</pre> + * <pre>CON-1009 : Uncommitted transaction(s) contains {0,number} bytes of incoming message data exceeding {1,number} bytes limit. Messages will be flowed to disk.</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54b58c60/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Connection_logmessages.properties ---------------------------------------------------------------------- diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Connection_logmessages.properties b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Connection_logmessages.properties index 4e6564e..5238559 100644 --- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Connection_logmessages.properties +++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Connection_logmessages.properties @@ -27,5 +27,5 @@ CLIENT_VERSION_REJECT = CON-1006 : Client version "{0}" rejected by validation MODEL_DELETE = CON-1007 : Connection close initiated by operator # 0 - operation name OPERATION = CON-1008 : Operation : {0} -LARGE_TRANSACTION_WARN = CON-1009 : Uncommitted transaction(s) contains {0,number} bytes of incoming message data exceeding {1,number} bytes limit. Messages will be flown to disk. +LARGE_TRANSACTION_WARN = CON-1009 : Uncommitted transaction(s) contains {0,number} bytes of incoming message data exceeding {1,number} bytes limit. Messages will be flowed to disk. http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54b58c60/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java ---------------------------------------------------------------------- diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java b/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java index 1da929a..f9d8111 100644 --- a/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java +++ b/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java @@ -50,7 +50,7 @@ public interface Connection<X extends Connection<X>> extends ConfiguredObject<X> @ManagedContextDefault(name = MAX_UNCOMMITTED_IN_MEMORY_SIZE, description = "Defines the maximum limit of total messages sizes (in bytes) from uncommitted transactions" + " which connection can hold in memory. If limit is breached, all messages from" - + " connection in-flight transactions are flown to disk including those arriving" + + " connection in-flight transactions are flowed to disk including those arriving" + " after breaching the limit.") long DEFAULT_MAX_UNCOMMITTED_IN_MEMORY_SIZE = 10l * 1024l * 1024l; @@ -109,7 +109,7 @@ public interface Connection<X extends Connection<X>> extends ConfiguredObject<X> Port<?> getPort(); @DerivedAttribute(description = "The maximum size in bytes that uncommitted transactions associated with this connection" - + " may grow before the messages contained within the transactions will be flown to disk. " + + " may grow before the messages contained within the transactions will be flowed to disk. " + " Disabled if negative.") long getMaxUncommittedInMemorySize(); http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54b58c60/doc/java-broker/src/docbkx/Java-Broker-Appendix-Operational-Logging-Messages.xml ---------------------------------------------------------------------- diff --git a/doc/java-broker/src/docbkx/Java-Broker-Appendix-Operational-Logging-Messages.xml b/doc/java-broker/src/docbkx/Java-Broker-Appendix-Operational-Logging-Messages.xml index 16e6fa9..7363d3e 100644 --- a/doc/java-broker/src/docbkx/Java-Broker-Appendix-Operational-Logging-Messages.xml +++ b/doc/java-broker/src/docbkx/Java-Broker-Appendix-Operational-Logging-Messages.xml @@ -842,7 +842,7 @@ <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-CON-1009"> <entry morerows="1">CON-1009</entry> <entry>Uncommitted transaction(s) contains <replaceable>size</replaceable> bytes of incoming message data - exceeding <replaceable>size</replaceable> bytes limit. Messages will be flown to disk.</entry> + exceeding <replaceable>size</replaceable> bytes limit. Messages will be flowed to disk.</entry> </row> <row> <entry> http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54b58c60/doc/java-broker/src/docbkx/runtime/Java-Broker-Runtime-Memory.xml ---------------------------------------------------------------------- diff --git a/doc/java-broker/src/docbkx/runtime/Java-Broker-Runtime-Memory.xml b/doc/java-broker/src/docbkx/runtime/Java-Broker-Runtime-Memory.xml index 148262b..a080ed3 100644 --- a/doc/java-broker/src/docbkx/runtime/Java-Broker-Runtime-Memory.xml +++ b/doc/java-broker/src/docbkx/runtime/Java-Broker-Runtime-Memory.xml @@ -102,15 +102,15 @@ it will evict enqueued messages from memory and <link linkend="Java-Broker-Runtime-Flow-To-Disk">flow them to disk</link>. For persistent messages this only means freeing the direct memory representation because they always have an on-disk representation to guard against unexpected failure (e.g., a power cut). For transient messages this implies additional disk I/O. - After being flown to disk messages need to be re-read from disk before delivery. + After being flowed to disk messages need to be re-read from disk before delivery. </para> <para>Please, note that messages from uncommitted transactions are not - <link linkend="Java-Broker-Runtime-Flow-To-Disk">flown to disk</link> as part of + <link linkend="Java-Broker-Runtime-Flow-To-Disk">flowed to disk</link> as part of <link linkend="Java-Broker-Runtime-Memory-Low-Memory-Direct">running into low direct memory conditions</link>, as they are not enqueued yet. The <literal>Connection</literal> has its own threshold for keeping messages from uncommitted transactions in memory. Only when <literal>Connection</literal> threshold is breached, the uncommitted messages on the connection are - <link linkend="Java-Broker-Runtime-Flow-To-Disk">flown to disk</link>.</para> + <link linkend="Java-Broker-Runtime-Flow-To-Disk">flowed to disk</link>.</para> </section> <section xml:id="Java-Broker-Runtime-Memory-Usage-BDB"> <title>Message Store</title> @@ -211,7 +211,7 @@ <listitem> The system property <literal>connection.maxUncommittedInMemorySize</literal> sets the threshold (in bytes) for total messages sizes (in bytes) from connection uncommitted transactions when messages are hold in memory. - If threshold is exceeded, all messages from connection in-flight transactions are flown to disk including + If threshold is exceeded, all messages from connection in-flight transactions are flowed to disk including those arriving after breaching the threshold. </listitem> </itemizedlist> @@ -239,7 +239,7 @@ </informalequation> </para> <para> - Where <mathphrase>N</mathphrase> denotes the total number of connections/sessions/messages on the broker. Furthermore, for direct memory only the messages that have not been flown to disk are relevant. + Where <mathphrase>N</mathphrase> denotes the total number of connections/sessions/messages on the broker. Furthermore, for direct memory only the messages that have not been flowed to disk are relevant. </para> <note> <para>The formulae assume the worst case in terms of memory usage: persistent messages and TLS connections. Transient messages consume less heap memory than peristent and plain connections consume less direct memory than TLS --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
