Skip to content

Commit 336b8a1

Browse files
authored
[addendum] Improve logging in Consensus Commit (#2933)
1 parent bdcbc76 commit 336b8a1

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

core/src/main/java/com/scalar/db/common/CoreError.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -976,7 +976,7 @@ public enum CoreError implements ScalarDbError {
976976
"Committing state failed with NoMutationException, but the coordinator status does not exist. Details: %s",
977977
"",
978978
""),
979-
CONSENSUS_COMMIT_CANNOT_COORDINATOR_STATUS(
979+
CONSENSUS_COMMIT_CANNOT_GET_COORDINATOR_STATUS(
980980
Category.UNKNOWN_TRANSACTION_STATUS_ERROR,
981981
"0002",
982982
"The coordinator status cannot be retrieved. Details: %s",

core/src/main/java/com/scalar/db/exception/storage/NoMutationException.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,23 @@ public class NoMutationException extends ExecutionException {
1313

1414
public NoMutationException(
1515
String message, @SuppressFBWarnings("EI_EXPOSE_REP2") List<? extends Mutation> mutations) {
16-
super(addTransactionIdToMessage(message, mutations));
16+
super(addMutationDetailsToMessage(message, mutations));
1717
this.mutations = mutations;
1818
}
1919

2020
public NoMutationException(
2121
String message,
2222
@SuppressFBWarnings("EI_EXPOSE_REP2") List<? extends Mutation> mutations,
2323
Throwable cause) {
24-
super(addTransactionIdToMessage(message, mutations), cause);
24+
super(addMutationDetailsToMessage(message, mutations), cause);
2525
this.mutations = mutations;
2626
}
2727

2828
public List<? extends Mutation> getMutations() {
2929
return ImmutableList.copyOf(mutations);
3030
}
3131

32-
private static String addTransactionIdToMessage(
32+
private static String addMutationDetailsToMessage(
3333
String message, List<? extends Mutation> mutations) {
3434
StringBuilder builder = new StringBuilder(message).append(". Mutations: [");
3535

core/src/main/java/com/scalar/db/transaction/consensuscommit/CommitHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ protected void handleCommitConflict(Snapshot snapshot, Exception cause)
261261
}
262262
} catch (CoordinatorException ex) {
263263
throw new UnknownTransactionStatusException(
264-
CoreError.CONSENSUS_COMMIT_CANNOT_COORDINATOR_STATUS.buildMessage(ex.getMessage()),
264+
CoreError.CONSENSUS_COMMIT_CANNOT_GET_COORDINATOR_STATUS.buildMessage(ex.getMessage()),
265265
ex,
266266
snapshot.getId());
267267
}
@@ -397,7 +397,7 @@ public TransactionState abortState(String id) throws UnknownTransactionStatusExc
397397
id);
398398
} catch (CoordinatorException e1) {
399399
throw new UnknownTransactionStatusException(
400-
CoreError.CONSENSUS_COMMIT_CANNOT_COORDINATOR_STATUS.buildMessage(e1.getMessage()),
400+
CoreError.CONSENSUS_COMMIT_CANNOT_GET_COORDINATOR_STATUS.buildMessage(e1.getMessage()),
401401
e1,
402402
id);
403403
}

0 commit comments

Comments
 (0)