From 064817ad48fe6c9576bebc5d6812ffd78f023688 Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Sun, 22 Sep 2024 18:37:07 +0530 Subject: [PATCH 1/3] Remove use of slf4j from bvm --- .../TransactionResourceManager.java | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java index b12e8a342b95..d268d71c296c 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java @@ -30,8 +30,6 @@ import io.ballerina.runtime.internal.scheduling.Scheduler; import io.ballerina.runtime.internal.scheduling.Strand; import io.ballerina.runtime.internal.util.RuntimeUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.File; import java.io.IOException; @@ -45,6 +43,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.time.LocalDateTime; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentSkipListSet; @@ -86,7 +85,7 @@ public class TransactionResourceManager { private static final String ATOMIKOS_LOG_NAME_PROPERTY = "com.atomikos.icatch.log_base_name"; private static final String ATOMIKOS_REGISTERED_PROPERTY = "com.atomikos.icatch.registered"; - private static final Logger log = LoggerFactory.getLogger(TransactionResourceManager.class); + private static final PrintStream outStream = System.out; private Map> resourceRegistry; private Map trxRegistry; private Map xidRegistry; @@ -261,7 +260,7 @@ public boolean prepare(String transactionId, String transactionBlockId) { xaResource.prepare(xid); } } catch (XAException e) { - log.error("error at transaction prepare phase in transaction " + transactionId + logError("error at transaction prepare phase in transaction " + transactionId + ":" + e.getMessage(), e); return false; } @@ -273,7 +272,7 @@ public boolean prepare(String transactionId, String transactionBlockId) { // resource participant reported failure. status = false; } - log.info(String.format("Transaction prepare (participants): %s", status ? "success" : "failed")); + outStream.printf("Transaction prepare (participants): %s%n", status ? "success" : "failed"); return status; } @@ -297,7 +296,7 @@ public boolean notifyCommit(String transactionId, String transactionBlockId) { } } catch (SystemException | HeuristicMixedException | HeuristicRollbackException | RollbackException e) { - log.error("error when committing transaction " + transactionId + ":" + e.getMessage(), e); + logError("error when committing transaction " + transactionId + ":" + e.getMessage(), e); commitSuccess = false; } } @@ -316,7 +315,7 @@ public boolean notifyCommit(String transactionId, String transactionBlockId) { } } } catch (XAException e) { - log.error("error when committing transaction " + transactionId + ":" + e.getMessage(), e); + logError("error when committing transaction " + transactionId + ":" + e.getMessage(), e); commitSuccess = false; } finally { ctx.close(); @@ -354,7 +353,7 @@ public boolean notifyAbort(String transactionId, String transactionBlockId) { trx.rollback(); } } catch (SystemException e) { - log.error("error when aborting transaction " + transactionId + ":" + e.getMessage(), e); + logError("error when aborting transaction " + transactionId + ":" + e.getMessage(), e); abortSuccess = false; } } @@ -373,7 +372,7 @@ public boolean notifyAbort(String transactionId, String transactionBlockId) { } } } catch (XAException e) { - log.error("error when aborting the transaction " + transactionId + ":" + e.getMessage(), e); + logError("error when aborting the transaction " + transactionId + ":" + e.getMessage(), e); abortSuccess = false; } finally { ctx.close(); @@ -412,7 +411,7 @@ public void beginXATransaction(String transactionId, String transactionBlockId, trxRegistry.put(combinedId, trx); } } catch (SystemException | NotSupportedException e) { - log.error("error in initiating transaction " + transactionId + ":" + e.getMessage(), e); + logError("error in initiating transaction " + transactionId + ":" + e.getMessage(), e); } } else { Xid xid = xidRegistry.get(combinedId); @@ -423,7 +422,7 @@ public void beginXATransaction(String transactionId, String transactionBlockId, try { xaResource.start(xid, TMNOFLAGS); } catch (XAException e) { - log.error("error in starting XA transaction " + transactionId + ":" + e.getMessage(), e); + logError("error in starting XA transaction " + transactionId + ":" + e.getMessage(), e); } } } @@ -556,7 +555,7 @@ void endXATransaction(String transactionId, String transactionBlockId, boolean a trx.delistResource(xaResource, TMSUCCESS); } } catch (IllegalStateException | SystemException e) { - log.error("error in ending the XA transaction " + transactionId + logError("error in ending the XA transaction " + transactionId + ":" + e.getMessage(), e); } } @@ -573,7 +572,7 @@ void endXATransaction(String transactionId, String transactionBlockId, boolean a xaResource.end(xid, abortOnly ? TMFAIL : TMSUCCESS); } } catch (XAException e) { - log.error("error in ending XA transaction " + transactionId + ":" + e.getMessage(), e); + logError("error in ending XA transaction " + transactionId + ":" + e.getMessage(), e); } } } @@ -600,7 +599,7 @@ private String generateCombinedTransactionId(String transactionId, String transa public void notifyResourceFailure(String gTransactionId) { failedResourceParticipantSet.add(gTransactionId); // The resource excepted (uncaught). - log.info("Trx infected callable unit excepted id : " + gTransactionId); + outStream.println("Trx infected callable unit excepted id : " + gTransactionId); } public void notifyLocalParticipantFailure(String gTransactionId, String blockId) { @@ -618,4 +617,9 @@ public Object getTransactionRecord(BArray xid) { return null; } } + + private void logError(String message, Exception err) { + outStream.println(LocalDateTime.now() + "ERROR\t" + message + "\n"); + err.printStackTrace(); + } } From 7290fc00250c1af4b44c506f8873b8e74163e0d6 Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Tue, 24 Sep 2024 10:50:38 +0530 Subject: [PATCH 2/3] Refactor code --- .../runtime/transactions/TransactionResourceManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java index d268d71c296c..48708839bad5 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java @@ -43,6 +43,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Arrays; import java.time.LocalDateTime; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentSkipListSet; @@ -619,7 +620,6 @@ public Object getTransactionRecord(BArray xid) { } private void logError(String message, Exception err) { - outStream.println(LocalDateTime.now() + "ERROR\t" + message + "\n"); - err.printStackTrace(); + outStream.println(LocalDateTime.now() + "ERROR\t" + message + "\n" + Arrays.toString(err.getStackTrace())); } } From 84069bea85f1814d1553f8b059afc357f0212887 Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Thu, 26 Sep 2024 15:43:46 +0530 Subject: [PATCH 3/3] Fix checkstyle issue --- .../runtime/transactions/TransactionResourceManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java index 48708839bad5..337fafeee032 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java @@ -38,13 +38,13 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Arrays; -import java.time.LocalDateTime; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentSkipListSet;