Skip to content

FLUME-3337: Log original exception when rollback fails #292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
annamariakeppler wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

FLUME-3337: Log original exception when rollback fails #292

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions flume-ng-core/src/main/java/org/apache/flume/channel/ChannelProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ public void processEventBatch(List<Event> events) {

tx.commit();
} catch (Throwable t) {
tx.rollback();
tryRollbackForException(tx, t);
if (t instanceof Error) {
LOG.error("Error while writing to required channel: " + reqChannel, t);
throw (Error) t;
Expand All @@ -204,9 +204,7 @@ public void processEventBatch(List<Event> events) {
"channel: " + reqChannel, t);
}
} finally {
if (tx != null) {
tx.close();
}
tx.close();
}
}

Expand All @@ -225,15 +223,13 @@ public void processEventBatch(List<Event> events) {

tx.commit();
} catch (Throwable t) {
tx.rollback();
tryRollbackForException(tx, t);
LOG.error("Unable to put batch on optional channel: " + optChannel, t);
if (t instanceof Error) {
throw (Error) t;
}
} finally {
if (tx != null) {
tx.close();
}
tx.close();
}
}
}
Expand Down Expand Up @@ -269,7 +265,7 @@ public void processEvent(Event event) {

tx.commit();
} catch (Throwable t) {
tx.rollback();
tryRollbackForException(tx, t);
if (t instanceof Error) {
LOG.error("Error while writing to required channel: " + reqChannel, t);
throw (Error) t;
Expand Down Expand Up @@ -298,7 +294,7 @@ public void processEvent(Event event) {

tx.commit();
} catch (Throwable t) {
tx.rollback();
tryRollbackForException(tx, t);
LOG.error("Unable to put event on optional channel: " + optChannel, t);
if (t instanceof Error) {
throw (Error) t;
Expand All @@ -310,4 +306,14 @@ public void processEvent(Event event) {
}
}
}

private void tryRollbackForException(Transaction tx, Throwable cause) {
try {
tx.rollback();
} catch (RuntimeException | Error e) {
LOG.error("Exception occurred during transaction rollback. " +
"Logging original exception and propagating this one", cause);
throw e;
}
}
}