[jboss-svn-commits] JBL Code SVN: r37810 - in labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed: server/impl and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Dec 15 10:13:51 EST 2011
Author: tomjenkinson
Date: 2011-12-15 10:13:51 -0500 (Thu, 15 Dec 2011)
New Revision: 37810
Modified:
labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/SimpleIsolatedServers.java
labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/TestResource.java
labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/TestResourceRecovery.java
labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/server/impl/ProxyXAResource.java
Log:
JBTM-895 updated the output
Modified: labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/SimpleIsolatedServers.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/SimpleIsolatedServers.java 2011-12-15 14:39:33 UTC (rev 37809)
+++ labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/SimpleIsolatedServers.java 2011-12-15 15:13:51 UTC (rev 37810)
@@ -274,7 +274,7 @@
getLocalServer("2000").doRecoveryManagerScan(true);
lock.incrementCount();
}
- }).start();
+ }, "RecMan2000").start();
}
{
@@ -283,7 +283,7 @@
getLocalServer("1000").doRecoveryManagerScan(true);
lock.incrementCount();
}
- }).start();
+ }, "RecMan1000").start();
}
synchronized (lock) {
Modified: labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/TestResource.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/TestResource.java 2011-12-15 14:39:33 UTC (rev 37809)
+++ labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/TestResource.java 2011-12-15 15:13:51 UTC (rev 37810)
@@ -83,6 +83,37 @@
public byte[] getBranchQualifier() {
return bqual;
}
+
+ public String toString() {
+ StringBuilder stringBuilder = new StringBuilder();
+ stringBuilder.append("< formatId=");
+ stringBuilder.append(formatId);
+ stringBuilder.append(", gtrid_length=");
+ stringBuilder.append(gtrid_length);
+ stringBuilder.append(", bqual_length=");
+ stringBuilder.append(bqual_length);
+ stringBuilder.append(", tx_uid=");
+ stringBuilder.append(new Uid(gtrid).stringForm());
+ stringBuilder.append(", node_name=");
+ stringBuilder.append(new String(Arrays.copyOfRange(gtrid, Uid.UID_SIZE, gtrid_length)));
+ stringBuilder.append(", branch_uid=");
+ stringBuilder.append(new Uid(bqual));;
+ stringBuilder.append(", subordinatenodename=");
+
+ int offset = Uid.UID_SIZE + 4;
+ int length = (bqual[offset++] << 24)
+ + ((bqual[offset++] & 0xFF) << 16)
+ + ((bqual[offset++] & 0xFF) << 8)
+ + (bqual[offset++] & 0xFF);
+ if (length > 0)
+ stringBuilder.append(new String(Arrays.copyOfRange(bqual, offset, offset+length)));
+
+
+ stringBuilder.append(", eis_name=unknown");
+ stringBuilder.append(" >");
+
+ return stringBuilder.toString();
+ }
};
fis.close();
}
@@ -94,7 +125,7 @@
* https://issues.jboss.org/browse/BYTEMAN-175
*/
public synchronized int prepare(Xid xid) throws XAException, Error {
- System.out.println(" TestResource (" + serverId + ") XA_PREPARE [" + xid + "]");
+ System.out.println("[" + Thread.currentThread().getName() + "] TestResource (" + serverId + ") XA_PREPARE [" + xid + "]");
if (readonly)
return XA_RDONLY;
@@ -126,7 +157,7 @@
}
public synchronized void commit(Xid id, boolean onePhase) throws XAException {
- System.out.println(" TestResource (" + serverId + ") XA_COMMIT [" + id + "]");
+ System.out.println("[" + Thread.currentThread().getName() + "] TestResource (" + serverId + ") XA_COMMIT [" + id + "]");
completionCounter.incrementCommit(serverId);
if (file != null) {
if (!file.delete()) {
@@ -137,7 +168,7 @@
}
public synchronized void rollback(Xid xid) throws XAException {
- System.out.println(" TestResource (" + serverId + ") XA_ROLLBACK[" + xid + "]");
+ System.out.println("[" + Thread.currentThread().getName() + "] TestResource (" + serverId + ") XA_ROLLBACK[" + xid + "]");
completionCounter.incrementRollback(serverId);
if (file != null) {
if (!file.delete()) {
@@ -148,15 +179,15 @@
}
public void start(Xid xid, int flags) throws XAException {
- System.out.println(" TestResource (" + serverId + ") XA_START [" + xid + "] Flags=" + flags);
+ System.out.println("[" + Thread.currentThread().getName() + "] TestResource (" + serverId + ") XA_START [" + xid + "] Flags=" + flags);
}
public void end(Xid xid, int flags) throws XAException {
- System.out.println(" TestResource (" + serverId + ") XA_END [" + xid + "] Flags=" + flags);
+ System.out.println("[" + Thread.currentThread().getName() + "] TestResource (" + serverId + ") XA_END [" + xid + "] Flags=" + flags);
}
public void forget(Xid xid) throws XAException {
- System.out.println(" TestResource (" + serverId + ") XA_FORGET[" + xid + "]");
+ System.out.println("[" + Thread.currentThread().getName() + "] TestResource (" + serverId + ") XA_FORGET[" + xid + "]");
}
public int getTransactionTimeout() throws XAException {
@@ -180,20 +211,21 @@
}
public Xid[] recover(int flag) throws XAException {
- Xid[] toReturn = null;
+ Xid toReturn = null;
if ((flag & XAResource.TMSTARTRSCAN) == XAResource.TMSTARTRSCAN) {
- System.out.println(" TestResource (" + serverId + ") RECOVER[XAResource.TMSTARTRSCAN]: " + serverId);
+ System.out.println("[" + Thread.currentThread().getName() + "] TestResource (" + serverId + ") RECOVER[XAResource.TMSTARTRSCAN]: " + serverId);
if (xid != null) {
- toReturn = new Xid[] { xid };
+ toReturn = xid;
+ System.out.println("[" + Thread.currentThread().getName() + "] TestResource (" + serverId + ") RECOVERED: " + toReturn);
}
}
if ((flag & XAResource.TMENDRSCAN) == XAResource.TMENDRSCAN) {
- System.out.println(" TestResource (" + serverId + ") RECOVER[XAResource.TMENDRSCAN]: " + serverId);
+ System.out.println("[" + Thread.currentThread().getName() + "] TestResource (" + serverId + ") RECOVER[XAResource.TMENDRSCAN]: " + serverId);
}
if (flag == XAResource.TMNOFLAGS) {
- System.out.println(" TestResource (" + serverId + ") RECOVER[XAResource.TMENDRSCAN]: " + serverId);
+ System.out.println("[" + Thread.currentThread().getName() + "] TestResource (" + serverId + ") RECOVER[XAResource.TMENDRSCAN]: " + serverId);
}
- return toReturn;
+ return new Xid[] { toReturn };
}
public boolean setTransactionTimeout(int seconds) throws XAException {
Modified: labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/TestResourceRecovery.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/TestResourceRecovery.java 2011-12-15 14:39:33 UTC (rev 37809)
+++ labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/TestResourceRecovery.java 2011-12-15 15:13:51 UTC (rev 37810)
@@ -37,7 +37,7 @@
public TestResourceRecovery(String nodeName) throws IOException {
this.nodeName = nodeName;
- System.out.println(nodeName + " asked to recover TestResource");
+ System.out.println("[" + Thread.currentThread().getName() + "] TestResourceRecovery (" + nodeName + ")");
File file = new File(System.getProperty("user.dir") + "/distributedjta-tests/TestResource/" + nodeName + "/");
if (file.exists() && file.isDirectory()) {
File[] listFiles = file.listFiles();
@@ -45,7 +45,7 @@
File currentFile = listFiles[i];
if (currentFile.getAbsolutePath().endsWith("_")) {
resources.add(new TestResource(nodeName, currentFile));
- System.out.println("Added TestResource: " + currentFile.getName());
+ System.out.println("[" + Thread.currentThread().getName() + "] TestResourceRecovery (" + nodeName + ") Added TestResource: " + currentFile.getName());
}
}
}
@@ -53,7 +53,7 @@
@Override
public XAResource[] getXAResources() {
- System.out.println(nodeName + "Returning list of TestResources of length: " + resources.size());
+ System.out.println("[" + Thread.currentThread().getName() + "] TestResourceRecovery (" + nodeName + ") returning list of TestResources of length: " + resources.size());
return resources.toArray(new XAResource[] {});
}
Modified: labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/server/impl/ProxyXAResource.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/server/impl/ProxyXAResource.java 2011-12-15 14:39:33 UTC (rev 37809)
+++ labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/server/impl/ProxyXAResource.java 2011-12-15 15:13:51 UTC (rev 37810)
@@ -82,7 +82,7 @@
*/
@Override
public void start(Xid xid, int flags) throws XAException {
- System.out.println(" ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_START [" + xid + "]");
+ System.out.println("[" + Thread.currentThread().getName() + "] ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_START [" + xid + "]");
}
/**
@@ -90,7 +90,7 @@
*/
@Override
public void end(Xid xid, int flags) throws XAException {
- System.out.println(" ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_END [" + xid + "]");
+ System.out.println("[" + Thread.currentThread().getName() + "] ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_END [" + xid + "]");
}
/**
@@ -100,21 +100,21 @@
*/
@Override
public int prepare(Xid xid) throws XAException {
- System.out.println(" ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_PREPARE [" + xid + "]");
+ System.out.println("[" + Thread.currentThread().getName() + "] ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_PREPARE [" + xid + "]");
Xid toPropagate = migratedXid != null ? migratedXid : xid;
int propagatePrepare = LookupProvider.getInstance().lookup(remoteServerName).prepare(toPropagate, !nonerecovered);
- System.out.println(" ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_PREPARED");
+ System.out.println("[" + Thread.currentThread().getName() + "] ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_PREPARED");
return propagatePrepare;
}
@Override
public void commit(Xid xid, boolean onePhase) throws XAException {
- System.out.println(" ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_COMMIT [" + xid + "]");
+ System.out.println("[" + Thread.currentThread().getName() + "] ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_COMMIT [" + xid + "]");
Xid toPropagate = migratedXid != null ? migratedXid : xid;
LookupProvider.getInstance().lookup(remoteServerName).commit(toPropagate, onePhase, !nonerecovered);
- System.out.println(" ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_COMMITED");
+ System.out.println("[" + Thread.currentThread().getName() + "] ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_COMMITED");
CompletionCounter.getInstance().incrementCommit(localServerName);
@@ -122,12 +122,12 @@
@Override
public void rollback(Xid xid) throws XAException {
- System.out.println(" ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_ROLLBACK[" + xid + "]");
+ System.out.println("[" + Thread.currentThread().getName() + "] ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_ROLLBACK[" + xid + "]");
Xid toPropagate = migratedXid != null ? migratedXid : xid;
try {
LookupProvider.getInstance().lookup(remoteServerName).rollback(toPropagate, !nonerecovered);
- System.out.println(" ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_ROLLBACKED");
+ System.out.println("[" + Thread.currentThread().getName() + "] ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_ROLLBACKED");
} catch (XAException e) {
// We know the remote side must have done a JBTM-927
if (e.errorCode == XAException.XAER_INVAL) {
@@ -153,36 +153,36 @@
@Override
public Xid[] recover(int flag) throws XAException {
if ((flag & XAResource.TMSTARTRSCAN) == XAResource.TMSTARTRSCAN) {
- System.out.println(" ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_RECOVER [XAResource.TMSTARTRSCAN]");
+ System.out.println("[" + Thread.currentThread().getName() + "] ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_RECOVER [XAResource.TMSTARTRSCAN]");
}
if ((flag & XAResource.TMENDRSCAN) == XAResource.TMENDRSCAN) {
- System.out.println(" ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_RECOVER [XAResource.TMENDRSCAN]");
+ System.out.println("[" + Thread.currentThread().getName() + "] ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_RECOVER [XAResource.TMENDRSCAN]");
}
Xid[] toReturn = LookupProvider.getInstance().lookup(remoteServerName).recoverFor(localServerName);
if (toReturn != null) {
for (int i = 0; i < toReturn.length; i++) {
- System.out.println(" ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_RECOVERD: " + toReturn[i]);
+ System.out.println("[" + Thread.currentThread().getName() + "] ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_RECOVERD: " + toReturn[i]);
}
}
if ((flag & XAResource.TMSTARTRSCAN) == XAResource.TMSTARTRSCAN) {
- System.out.println(" ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_RECOVERD[XAResource.TMSTARTRSCAN]");
+ System.out.println("[" + Thread.currentThread().getName() + "] ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_RECOVERD[XAResource.TMSTARTRSCAN]");
}
if ((flag & XAResource.TMENDRSCAN) == XAResource.TMENDRSCAN) {
- System.out.println(" ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_RECOVERD[XAResource.TMENDRSCAN]");
+ System.out.println("[" + Thread.currentThread().getName() + "] ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_RECOVERD[XAResource.TMENDRSCAN]");
}
return toReturn;
}
@Override
public void forget(Xid xid) throws XAException {
- System.out.println(" ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_FORGET [" + xid + "]");
+ System.out.println("[" + Thread.currentThread().getName() + "] ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_FORGET [" + xid + "]");
Xid toPropagate = migratedXid != null ? migratedXid : xid;
LookupProvider.getInstance().lookup(remoteServerName).forget(toPropagate, !nonerecovered);
- System.out.println(" ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_FORGETED[" + xid + "]");
+ System.out.println("[" + Thread.currentThread().getName() + "] ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_FORGETED[" + xid + "]");
}
@Override
More information about the jboss-svn-commits
mailing list