From bda2f4ab9ecd693f85ff21e2bf94fe55ca90608b Mon Sep 17 00:00:00 2001 From: tpantelis Date: Wed, 12 Nov 2014 21:57:49 -0500 Subject: [PATCH] Bug 2347: Minor fixes to correct log output DOMConcurrentDataCommitCoordinator#handleException hard-codes the error mapper to CAN_COMMIT_ERROR_MAPPER however this should be passed in corresponding to the phase. In TransactionCommitFailedExceptionMapper, the opNames for PRE_COMMIT_MAPPER and CAN_COMMIT_ERROR_MAPPER are reversed, should be "preCommit", "canCommit" respectively. Change-Id: I6c0513f0f6265ec19de39476c95efefee53d2ee1 Signed-off-by: tpantelis --- .../DOMConcurrentDataCommitCoordinator.java | 18 +++++++++++------- ...TransactionCommitFailedExceptionMapper.java | 4 ++-- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMConcurrentDataCommitCoordinator.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMConcurrentDataCommitCoordinator.java index 25bf228905..d8a7a0084c 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMConcurrentDataCommitCoordinator.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMConcurrentDataCommitCoordinator.java @@ -95,7 +95,8 @@ public class DOMConcurrentDataCommitCoordinator implements DOMDataCommitExecutor public void onSuccess(Boolean result) { if (result == null || !result) { handleException(clientSubmitFuture, transaction, cohorts, cohortSize, - CAN_COMMIT, new TransactionCommitFailedException( + CAN_COMMIT, TransactionCommitFailedExceptionMapper.CAN_COMMIT_ERROR_MAPPER, + new TransactionCommitFailedException( "Can Commit failed, no detailed cause available.")); } else { if(remaining.decrementAndGet() == 0) { @@ -107,7 +108,8 @@ public class DOMConcurrentDataCommitCoordinator implements DOMDataCommitExecutor @Override public void onFailure(Throwable t) { - handleException(clientSubmitFuture, transaction, cohorts, cohortSize, CAN_COMMIT, t); + handleException(clientSubmitFuture, transaction, cohorts, cohortSize, CAN_COMMIT, + TransactionCommitFailedExceptionMapper.CAN_COMMIT_ERROR_MAPPER, t); } }; @@ -134,7 +136,8 @@ public class DOMConcurrentDataCommitCoordinator implements DOMDataCommitExecutor @Override public void onFailure(Throwable t) { - handleException(clientSubmitFuture, transaction, cohorts, cohortSize, PRE_COMMIT, t); + handleException(clientSubmitFuture, transaction, cohorts, cohortSize, PRE_COMMIT, + TransactionCommitFailedExceptionMapper.PRE_COMMIT_MAPPER, t); } }; @@ -163,7 +166,8 @@ public class DOMConcurrentDataCommitCoordinator implements DOMDataCommitExecutor @Override public void onFailure(Throwable t) { - handleException(clientSubmitFuture, transaction, cohorts, cohortSize, COMMIT, t); + handleException(clientSubmitFuture, transaction, cohorts, cohortSize, COMMIT, + TransactionCommitFailedExceptionMapper.COMMIT_ERROR_MAPPER, t); } }; @@ -176,7 +180,8 @@ public class DOMConcurrentDataCommitCoordinator implements DOMDataCommitExecutor private void handleException(final AsyncNotifyingSettableFuture clientSubmitFuture, final DOMDataWriteTransaction transaction, final Iterable cohorts, int cohortSize, - final String phase, final Throwable t) { + final String phase, final TransactionCommitFailedExceptionMapper exMapper, + final Throwable t) { if(clientSubmitFuture.isDone()) { // We must have had failures from multiple cohorts. @@ -191,8 +196,7 @@ public class DOMConcurrentDataCommitCoordinator implements DOMDataCommitExecutor e = new RuntimeException("Unexpected error occurred", t); } - final TransactionCommitFailedException clientException = - TransactionCommitFailedExceptionMapper.CAN_COMMIT_ERROR_MAPPER.apply(e); + final TransactionCommitFailedException clientException = exMapper.apply(e); // Transaction failed - tell all cohorts to abort. diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/TransactionCommitFailedExceptionMapper.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/TransactionCommitFailedExceptionMapper.java index 799a8a09ed..3b5c353202 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/TransactionCommitFailedExceptionMapper.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/TransactionCommitFailedExceptionMapper.java @@ -18,9 +18,9 @@ import org.opendaylight.yangtools.util.concurrent.ExceptionMapper; final class TransactionCommitFailedExceptionMapper extends ExceptionMapper { - static final TransactionCommitFailedExceptionMapper PRE_COMMIT_MAPPER = create("canCommit"); + static final TransactionCommitFailedExceptionMapper PRE_COMMIT_MAPPER = create("preCommit"); - static final TransactionCommitFailedExceptionMapper CAN_COMMIT_ERROR_MAPPER = create("preCommit"); + static final TransactionCommitFailedExceptionMapper CAN_COMMIT_ERROR_MAPPER = create("canCommit"); static final TransactionCommitFailedExceptionMapper COMMIT_ERROR_MAPPER = create("commit"); -- 2.36.6