ozeigermann 2004/02/19 09:01:33
Modified: src/share/org/apache/slide/transaction Tag:
SLIDE_2_0_RELEASE_BRANCH SlideTransaction.java
src/stores/org/apache/slide/store/txfile Tag:
SLIDE_2_0_RELEASE_BRANCH
AbstractTxFileStoreService.java
TxFileContentStore.java
TxXMLFileDescriptorsStore.java
Log:
Minor logging enhancement
Revision Changes Path
No revision
No revision
1.20.2.2 +8 -8
jakarta-slide/src/share/org/apache/slide/transaction/SlideTransaction.java
Index: SlideTransaction.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/transaction/SlideTransaction.java,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -u -r1.20.2.1 -r1.20.2.2
--- SlideTransaction.java 5 Feb 2004 16:05:14 -0000 1.20.2.1
+++ SlideTransaction.java 19 Feb 2004 17:01:33 -0000 1.20.2.2
@@ -227,7 +227,7 @@
(SlideTransaction.class.getName() + ".commitFail",
resourceManager, getXAErrorCode(e), toString());
transactionManager.getLogger().log
- (logMessage, LOG_CHANNEL, Logger.WARNING);
+ (logMessage, e, LOG_CHANNEL, Logger.WARNING);
exceptions.addElement(e);
fail = true;
status = Status.STATUS_MARKED_ROLLBACK;
@@ -255,7 +255,7 @@
(SlideTransaction.class.getName() + ".prepareFail",
resourceManager, getXAErrorCode(e), toString());
transactionManager.getLogger().log
- (logMessage, LOG_CHANNEL, Logger.WARNING);
+ (logMessage, e, LOG_CHANNEL, Logger.WARNING);
// Adding the exception to the error code list
exceptions.addElement(e);
fail = true;
@@ -283,7 +283,7 @@
(SlideTransaction.class.getName() + ".rollbackFail",
resourceManager, getXAErrorCode(e), toString());
transactionManager.getLogger().log
- (logMessage, LOG_CHANNEL, Logger.WARNING);
+ (logMessage, e, LOG_CHANNEL, Logger.WARNING);
exceptions.addElement(e);
fail = true;
}
@@ -304,7 +304,7 @@
(SlideTransaction.class.getName() + ".commitFail",
resourceManager, getXAErrorCode(e), toString());
transactionManager.getLogger().log
- (logMessage, LOG_CHANNEL, Logger.WARNING);
+ (logMessage, e, LOG_CHANNEL, Logger.WARNING);
exceptions.addElement(e);
fail = true;
}
No revision
No revision
1.7.2.3 +35 -16
jakarta-slide/src/stores/org/apache/slide/store/txfile/AbstractTxFileStoreService.java
Index: AbstractTxFileStoreService.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/txfile/AbstractTxFileStoreService.java,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- AbstractTxFileStoreService.java 5 Feb 2004 16:07:53 -0000 1.7.2.2
+++ AbstractTxFileStoreService.java 19 Feb 2004 17:01:33 -0000 1.7.2.3
@@ -55,7 +55,7 @@
*/
public abstract class AbstractTxFileStoreService extends AbstractServiceBase
implements Status {
- private static final String LOG_CHANNEL =
AbstractTxFileStoreService.class.getName();
+ protected static final String LOG_CHANNEL =
AbstractTxFileStoreService.class.getName();
protected static final String STORE_DIR_PARAMETER = "rootpath";
protected static final String WORK_DIR_PARAMETER = "workpath";
@@ -202,6 +202,11 @@
throw new XAException(XAException.XA_RBROLLBACK);
}
} catch (ResourceManagerException e) {
+ getLogger().log(
+ "Thread " + Thread.currentThread() + " failed to prepare
transaction branch " + txId,
+ e,
+ LOG_CHANNEL,
+ Logger.CRITICAL);
throwXAException(e);
}
// XXX just to make compiler quiet (throwXAException will always throw an
exception, so this can never happen)
@@ -219,6 +224,11 @@
rm.rollbackTransaction(txId);
activeTransactionBranch.set(null);
} catch (ResourceManagerException e) {
+ getLogger().log(
+ "Thread " + Thread.currentThread() + " failed to roll back
transaction branch " + txId,
+ e,
+ LOG_CHANNEL,
+ Logger.CRITICAL);
throwXAException(e);
}
}
@@ -238,6 +248,11 @@
rm.commitTransaction(txId);
activeTransactionBranch.set(null);
} catch (ResourceManagerException e) {
+ getLogger().log(
+ "Thread " + Thread.currentThread() + " failed to commit transaction
branch " + txId,
+ e,
+ LOG_CHANNEL,
+ Logger.CRITICAL);
throwXAException(e);
}
}
@@ -381,12 +396,13 @@
// XXX strictly speaking, this is incorrect, as we actually did not
chck for deadlock,
// but silently assume a deadlock must have been the cause for the
failed lock
- try {
- rm.markTransactionForRollback(txId);
- } catch (ResourceManagerException re) {
- throw new ServiceAccessException(this, re);
+ if (txId != null) {
+ try {
+ rm.markTransactionForRollback(txId);
+ } catch (ResourceManagerException re) {
+ throw new ServiceAccessException(this, re);
+ }
}
-
getLogger().log(
"DEADLOCK VICTIM: Thread "
+ Thread.currentThread()
@@ -400,16 +416,19 @@
} else {
- try {
- rm.markTransactionForRollback(txId);
- } catch (ResourceManagerException re) {
- throw new ServiceAccessException(this, re);
- }
-
getLogger().log(
- "Thread " + Thread.currentThread() + " marked transaction branch "
+ txId + " for rollback",
+ "Thread " + Thread.currentThread() + " marking transaction branch "
+ txId + " for rollback",
+ cause,
LOG_CHANNEL,
Logger.WARNING);
+
+ if (txId != null) {
+ try {
+ rm.markTransactionForRollback(txId);
+ } catch (ResourceManagerException re) {
+ throw new ServiceAccessException(this, re);
+ }
+ }
throw new ServiceAccessException(this, cause);
1.4.2.2 +5 -3
jakarta-slide/src/stores/org/apache/slide/store/txfile/TxFileContentStore.java
Index: TxFileContentStore.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/txfile/TxFileContentStore.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- TxFileContentStore.java 5 Feb 2004 16:07:53 -0000 1.4.2.1
+++ TxFileContentStore.java 19 Feb 2004 17:01:33 -0000 1.4.2.2
@@ -45,6 +45,8 @@
*/
public class TxFileContentStore extends AbstractTxFileStoreService implements
ContentStore {
+ protected static final String LOG_CHANNEL = TxFileContentStore.class.getName();
+
public NodeRevisionContent retrieveRevisionContent(Uri uri,
NodeRevisionDescriptor revisionDescriptor)
throws ServiceAccessException, RevisionNotFoundException {
1.3.2.2 +5 -3
jakarta-slide/src/stores/org/apache/slide/store/txfile/TxXMLFileDescriptorsStore.java
Index: TxXMLFileDescriptorsStore.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/txfile/TxXMLFileDescriptorsStore.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- TxXMLFileDescriptorsStore.java 5 Feb 2004 16:07:53 -0000 1.3.2.1
+++ TxXMLFileDescriptorsStore.java 19 Feb 2004 17:01:33 -0000 1.3.2.2
@@ -48,6 +48,8 @@
extends AbstractTxFileStoreService
implements NodeStore, LockStore, RevisionDescriptorsStore,
RevisionDescriptorStore, SecurityStore {
+ protected static final String LOG_CHANNEL = TxFileContentStore.class.getName();
+
protected static final String ENCODING_PARAMETER = "encoding";
protected String characterEncoding = "UTF-8"; // a save choice
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
