You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by un...@apache.org on 2014/09/17 14:15:58 UTC
svn commit: r1625544 - in
/jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core:
journal/AppendRecord.java util/db/ConnectionHelper.java
Author: unico
Date: Wed Sep 17 12:15:57 2014
New Revision: 1625544
URL: http://svn.apache.org/r1625544
Log:
JCR-3811
- Allow retrying of failed journal entry database inserts
- Fix bug in ConnectionHelper where resources were not cleaned up when a SQL call would fail in batch mode
Modified:
jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AppendRecord.java
jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java
Modified: jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AppendRecord.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AppendRecord.java?rev=1625544&r1=1625543&r2=1625544&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AppendRecord.java (original)
+++ jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AppendRecord.java Wed Sep 17 12:15:57 2014
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.core.journal;
+import org.apache.jackrabbit.core.data.db.TempFileInputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -23,7 +24,6 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -298,7 +298,7 @@ public class AppendRecord extends Abstra
private InputStream openInput() throws JournalException {
if (file != null) {
try {
- return new FileInputStream(file);
+ return new TempFileInputStream(file, false);
} catch (IOException e) {
String msg = "Unable to open file input on: " + file.getPath();
throw new JournalException(msg, e);
Modified: jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java?rev=1625544&r1=1625543&r2=1625544&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java (original)
+++ jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java Wed Sep 17 12:15:57 2014
@@ -531,38 +531,39 @@ public class ConnectionHelper {
}
public final T doTry() throws SQLException {
- if (inBatchMode()) {
- return call();
- } else {
- boolean sleepInterrupted = false;
- int failures = 0;
- SQLException lastException = null;
- while (!sleepInterrupted && (blockOnConnectionLoss || failures <= RETRIES)) {
- try {
- T object = call();
- cleanupParamResources();
- return object;
- } catch (SQLException e) {
- lastException = e;
- }
- log.error("Failed to execute SQL (stacktrace on DEBUG log level): " + lastException);
- log.debug("Failed to execute SQL", lastException);
- failures++;
- if (!resetParamResources()) {
- break;
- }
- if (blockOnConnectionLoss || failures <= RETRIES) { // if we're going to try again
+ try {
+ if (inBatchMode()) {
+ return call();
+ } else {
+ boolean sleepInterrupted = false;
+ int failures = 0;
+ SQLException lastException = null;
+ while (!sleepInterrupted && (blockOnConnectionLoss || failures <= RETRIES)) {
try {
- Thread.sleep(SLEEP_BETWEEN_RETRIES_MS);
- } catch (InterruptedException e1) {
- Thread.currentThread().interrupt();
- sleepInterrupted = true;
- log.error("Interrupted: canceling retry");
+ return call();
+ } catch (SQLException e) {
+ lastException = e;
+ }
+ log.error("Failed to execute SQL (stacktrace on DEBUG log level): " + lastException);
+ log.debug("Failed to execute SQL", lastException);
+ failures++;
+ if (!resetParamResources()) {
+ break;
+ }
+ if (blockOnConnectionLoss || failures <= RETRIES) { // if we're going to try again
+ try {
+ Thread.sleep(SLEEP_BETWEEN_RETRIES_MS);
+ } catch (InterruptedException e1) {
+ Thread.currentThread().interrupt();
+ sleepInterrupted = true;
+ log.error("Interrupted: canceling retry");
+ }
}
}
+ throw lastException;
}
+ } finally {
cleanupParamResources();
- throw lastException;
}
}