From b4708e8c319be58765ace1308aed21c8d15e445b Mon Sep 17 00:00:00 2001 From: brfrn169 Date: Fri, 1 Aug 2025 22:55:39 +0900 Subject: [PATCH] [addendum] Improve logging in Consensus Commit --- core/src/main/java/com/scalar/db/common/CoreError.java | 2 +- .../scalar/db/exception/storage/NoMutationException.java | 6 +++--- .../db/transaction/consensuscommit/CommitHandler.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/com/scalar/db/common/CoreError.java b/core/src/main/java/com/scalar/db/common/CoreError.java index 6664ea599a..b4e5fbe682 100644 --- a/core/src/main/java/com/scalar/db/common/CoreError.java +++ b/core/src/main/java/com/scalar/db/common/CoreError.java @@ -976,7 +976,7 @@ public enum CoreError implements ScalarDbError { "Committing state failed with NoMutationException, but the coordinator status does not exist. Details: %s", "", ""), - CONSENSUS_COMMIT_CANNOT_COORDINATOR_STATUS( + CONSENSUS_COMMIT_CANNOT_GET_COORDINATOR_STATUS( Category.UNKNOWN_TRANSACTION_STATUS_ERROR, "0002", "The coordinator status cannot be retrieved. Details: %s", diff --git a/core/src/main/java/com/scalar/db/exception/storage/NoMutationException.java b/core/src/main/java/com/scalar/db/exception/storage/NoMutationException.java index 92eb0f9255..f6ad6e48aa 100644 --- a/core/src/main/java/com/scalar/db/exception/storage/NoMutationException.java +++ b/core/src/main/java/com/scalar/db/exception/storage/NoMutationException.java @@ -13,7 +13,7 @@ public class NoMutationException extends ExecutionException { public NoMutationException( String message, @SuppressFBWarnings("EI_EXPOSE_REP2") List mutations) { - super(addTransactionIdToMessage(message, mutations)); + super(addMutationDetailsToMessage(message, mutations)); this.mutations = mutations; } @@ -21,7 +21,7 @@ public NoMutationException( String message, @SuppressFBWarnings("EI_EXPOSE_REP2") List mutations, Throwable cause) { - super(addTransactionIdToMessage(message, mutations), cause); + super(addMutationDetailsToMessage(message, mutations), cause); this.mutations = mutations; } @@ -29,7 +29,7 @@ public List getMutations() { return ImmutableList.copyOf(mutations); } - private static String addTransactionIdToMessage( + private static String addMutationDetailsToMessage( String message, List mutations) { StringBuilder builder = new StringBuilder(message).append(". Mutations: ["); diff --git a/core/src/main/java/com/scalar/db/transaction/consensuscommit/CommitHandler.java b/core/src/main/java/com/scalar/db/transaction/consensuscommit/CommitHandler.java index b03f93d73d..1ebdb6f17d 100644 --- a/core/src/main/java/com/scalar/db/transaction/consensuscommit/CommitHandler.java +++ b/core/src/main/java/com/scalar/db/transaction/consensuscommit/CommitHandler.java @@ -261,7 +261,7 @@ protected void handleCommitConflict(Snapshot snapshot, Exception cause) } } catch (CoordinatorException ex) { throw new UnknownTransactionStatusException( - CoreError.CONSENSUS_COMMIT_CANNOT_COORDINATOR_STATUS.buildMessage(ex.getMessage()), + CoreError.CONSENSUS_COMMIT_CANNOT_GET_COORDINATOR_STATUS.buildMessage(ex.getMessage()), ex, snapshot.getId()); } @@ -397,7 +397,7 @@ public TransactionState abortState(String id) throws UnknownTransactionStatusExc id); } catch (CoordinatorException e1) { throw new UnknownTransactionStatusException( - CoreError.CONSENSUS_COMMIT_CANNOT_COORDINATOR_STATUS.buildMessage(e1.getMessage()), + CoreError.CONSENSUS_COMMIT_CANNOT_GET_COORDINATOR_STATUS.buildMessage(e1.getMessage()), e1, id); }