You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2015/04/01 22:45:30 UTC
[1/5] activemq-6 git commit: Improving Print-data on DuplicateIDs
(showing some information to help Bridge Duplicate IDs)
Repository: activemq-6
Updated Branches:
refs/heads/master 36b83d9b4 -> f8a25d4f7
Improving Print-data on DuplicateIDs (showing some information to help Bridge Duplicate IDs)
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/a7a362b1
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/a7a362b1
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/a7a362b1
Branch: refs/heads/master
Commit: a7a362b1d71819b6ed2eb3f5cfb241a8a1bc1376
Parents: 36b83d9
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Apr 1 16:10:17 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Apr 1 16:10:17 2015 -0400
----------------------------------------------------------------------
.../impl/journal/JournalStorageManager.java | 38 ++++++++++++++++++--
1 file changed, 36 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a7a362b1/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalStorageManager.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalStorageManager.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalStorageManager.java
index 1e86bf9..07599fe 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalStorageManager.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalStorageManager.java
@@ -115,6 +115,7 @@ import org.apache.activemq.utils.ByteUtil;
import org.apache.activemq.utils.DataConstants;
import org.apache.activemq.utils.ExecutorFactory;
import org.apache.activemq.utils.ActiveMQThreadFactory;
+import org.apache.activemq.utils.UUID;
import org.apache.activemq.utils.XidCodecSupport;
import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.ACKNOWLEDGE_CURSOR;
@@ -3489,9 +3490,42 @@ public class JournalStorageManager implements StorageManager
// SimpleString simpleStr = new SimpleString(duplID);
// return "DuplicateIDEncoding [address=" + address + ", duplID=" + simpleStr + "]";
- return "DuplicateIDEncoding [address=" + address + ", duplID=" + ByteUtil.bytesToHex(duplID, 2) + "]";
- }
+ String bridgeRepresentation = null;
+
+ // The bridge will generate IDs on these terms:
+ // This will make them easier to read
+ if (address.toString().startsWith("BRIDGE") && duplID.length == 24)
+ {
+ try
+ {
+ ByteBuffer buff = ByteBuffer.wrap(duplID);
+ // 16 for UUID
+ byte[] bytesUUID = new byte[16];
+
+ buff.get(bytesUUID);
+
+ UUID uuid = new UUID(UUID.TYPE_TIME_BASED, bytesUUID);
+
+ long id = buff.getLong();
+ bridgeRepresentation = "nodeUUID=" + uuid.toString() + " messageID=" + id;
+ }
+ catch (Throwable ignored)
+ {
+ bridgeRepresentation = null;
+ }
+ }
+
+ if (bridgeRepresentation != null)
+ {
+ return "DuplicateIDEncoding [address=" + address + ", duplID=" + ByteUtil.bytesToHex(duplID, 2) + " / " +
+ bridgeRepresentation + "]";
+ }
+ else
+ {
+ return "DuplicateIDEncoding [address=" + address + ", duplID=" + ByteUtil.bytesToHex(duplID, 2) + "]";
+ }
+ }
}
/**
[5/5] activemq-6 git commit: This closes #200 - docs and settings
Posted by jb...@apache.org.
This closes #200 - docs and settings
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/f8a25d4f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/f8a25d4f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/f8a25d4f
Branch: refs/heads/master
Commit: f8a25d4f7c19484fd5453e04b42c28e634e0ab87
Parents: 36b83d9 c38acee
Author: jbertram <jb...@redhat.com>
Authored: Wed Apr 1 15:35:32 2015 -0500
Committer: jbertram <jb...@redhat.com>
Committed: Wed Apr 1 15:35:32 2015 -0500
----------------------------------------------------------------------
.../impl/journal/JournalStorageManager.java | 38 ++++++++++++++++++-
docs/user-manual/en/configuration-index.md | 2 +-
docs/user-manual/en/persistence.md | 5 +++
etc/IDEA-style.jar | Bin 3375 -> 4219 bytes
tests/extra-tests/pom.xml | 2 +-
5 files changed, 43 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[4/5] activemq-6 git commit: fixing extra-tests dependency
Posted by jb...@apache.org.
fixing extra-tests dependency
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/c38acee5
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/c38acee5
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/c38acee5
Branch: refs/heads/master
Commit: c38acee50996420c451f600008dafe9e5371ded3
Parents: 6239ff6
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Apr 1 16:16:13 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Apr 1 16:16:13 2015 -0400
----------------------------------------------------------------------
tests/extra-tests/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/c38acee5/tests/extra-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/extra-tests/pom.xml b/tests/extra-tests/pom.xml
index c6c5bf0..4f8647d 100644
--- a/tests/extra-tests/pom.xml
+++ b/tests/extra-tests/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.activemq.tests</groupId>
<artifactId>activemq-tests-pom</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>10.0.0-SNAPSHOT</version>
</parent>
<artifactId>extra-tests</artifactId>
[3/5] activemq-6 git commit: settings updates
Posted by jb...@apache.org.
settings updates
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/6239ff62
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/6239ff62
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/6239ff62
Branch: refs/heads/master
Commit: 6239ff6291348ae31fe776de1bcef9d73f24c3f5
Parents: 48d002e
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Apr 1 16:13:56 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Apr 1 16:13:56 2015 -0400
----------------------------------------------------------------------
etc/IDEA-style.jar | Bin 3375 -> 4219 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/6239ff62/etc/IDEA-style.jar
----------------------------------------------------------------------
diff --git a/etc/IDEA-style.jar b/etc/IDEA-style.jar
index d3bd122..431a9d9 100644
Binary files a/etc/IDEA-style.jar and b/etc/IDEA-style.jar differ
[2/5] activemq-6 git commit: adding a word about compact-min-files on
the docs
Posted by jb...@apache.org.
adding a word about compact-min-files on the docs
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/48d002e1
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/48d002e1
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/48d002e1
Branch: refs/heads/master
Commit: 48d002e19a19de9664ccc548b36afd697434da31
Parents: a7a362b
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Apr 1 16:10:39 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Apr 1 16:10:39 2015 -0400
----------------------------------------------------------------------
docs/user-manual/en/configuration-index.md | 2 +-
docs/user-manual/en/persistence.md | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/48d002e1/docs/user-manual/en/configuration-index.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/configuration-index.md b/docs/user-manual/en/configuration-index.md
index b083eec..5991446 100644
--- a/docs/user-manual/en/configuration-index.md
+++ b/docs/user-manual/en/configuration-index.md
@@ -48,7 +48,7 @@ Name | Description
[jmx-management-enabled](management.md "30.2.1. Configuring JMX") | true means that the management API is available via JMX. Default=true
[journal-buffer-size](persistence.md) | The size of the internal buffer on the journal in KB. Default=490 KiB
[journal-buffer-timeout](persistence.md) | The Flush timeout for the journal buffer
-[journal-compact-min-files](persistence.md) | The minimal number of data files before we can start compacting. Default=10
+[journal-compact-min-files](persistence.md) | The minimal number of data files before we can start compacting. Setting this to 0 means compacting is disabled. Default=10
[journal-compact-percentage](persistence.md) | The percentage of live data on which we consider compacting the journal. Default=30
[journal-directory](persistence.md) | the directory to store the journal files in. Default=data/journal
[journal-file-size](persistence.md) | the size (in bytes) of each journal file. Default=10485760 (10 MB)
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/48d002e1/docs/user-manual/en/persistence.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/persistence.md b/docs/user-manual/en/persistence.md
index dff1bb0..bf6bf01 100644
--- a/docs/user-manual/en/persistence.md
+++ b/docs/user-manual/en/persistence.md
@@ -269,6 +269,11 @@ The message journal is configured using the following attributes in
journal. The compacting algorithm won't start until you have at
least `journal-compact-min-files`
+ Setting this to 0 will disable the feature to compact completely.
+ This could be dangerous though as the journal could grow indefinitely.
+ Use it wisely!
+
+
The default for this parameter is `10`
- `journal-compact-percentage`