Quantcast

[1/2] activemq git commit: [AMQ-6644] - ensure journal files past last update are not included in the logged gc set in error

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[1/2] activemq git commit: [AMQ-6644] - ensure journal files past last update are not included in the logged gc set in error

cshannon
Repository: activemq
Updated Branches:
  refs/heads/activemq-5.14.x b8a7aa80e -> 0a46ffdb5


[AMQ-6644] - ensure journal files past last update are not included in the logged gc set in error


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/0bbb82e7
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/0bbb82e7
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/0bbb82e7

Branch: refs/heads/activemq-5.14.x
Commit: 0bbb82e7e50754ca8d710677996b1af06c569887
Parents: b8a7aa8
Author: gtully <[hidden email]>
Authored: Tue Apr 4 12:21:31 2017 +0100
Committer: Christopher L. Shannon (cshannon) <[hidden email]>
Committed: Tue Apr 11 10:31:25 2017 -0400

----------------------------------------------------------------------
 .../java/org/apache/activemq/store/kahadb/MessageDatabase.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/0bbb82e7/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
----------------------------------------------------------------------
diff --git a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
index d10c064..8d19104 100644
--- a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
+++ b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
@@ -1733,7 +1733,8 @@ public abstract class MessageDatabase extends ServiceSupport implements BrokerSe
             }
 
             if (lastUpdate != null) {
-                gcCandidateSet.remove(lastUpdate.getDataFileId());
+                // we won't delete past the last update, ackCompaction journal can be a candidate in error
+                gcCandidateSet.removeAll(new TreeSet<Integer>(gcCandidateSet.tailSet(lastUpdate.getDataFileId())));
             }
 
             // Don't GC files under replication

Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[2/2] activemq git commit: https://issues.apache.org/jira/browse/AMQ-6649

cshannon
https://issues.apache.org/jira/browse/AMQ-6649

Adding MS SQL jdbc driver 6.1 support

(cherry picked from commit 58046194d02bdcfe74fc8717457229d571ac4627)


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/0a46ffdb
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/0a46ffdb
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/0a46ffdb

Branch: refs/heads/activemq-5.14.x
Commit: 0a46ffdb5aa030b0051c95d6014fde5552c29ea0
Parents: 0bbb82e
Author: Christopher L. Shannon (cshannon) <[hidden email]>
Authored: Mon Apr 10 08:51:33 2017 -0400
Committer: Christopher L. Shannon (cshannon) <[hidden email]>
Committed: Tue Apr 11 10:31:58 2017 -0400

----------------------------------------------------------------------
 .../jdbc/microsoft_jdbc_driver_6_1_for_sql_server  | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/0a46ffdb/activemq-jdbc-store/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/microsoft_jdbc_driver_6_1_for_sql_server
----------------------------------------------------------------------
diff --git a/activemq-jdbc-store/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/microsoft_jdbc_driver_6_1_for_sql_server b/activemq-jdbc-store/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/microsoft_jdbc_driver_6_1_for_sql_server
new file mode 100644
index 0000000..18ae53d
--- /dev/null
+++ b/activemq-jdbc-store/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/microsoft_jdbc_driver_6_1_for_sql_server
@@ -0,0 +1,17 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+class=org.apache.activemq.store.jdbc.adapter.TransactJDBCAdapter
\ No newline at end of file

Loading...