Log improvements + small fixes

Alluxio · Nov 8, 2019 · 32bc94a · 32bc94a
1 parent 017a697
commit 32bc94a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/core/server/common/src/main/java/alluxio/master/journal/raft/BufferedJournalApplier.java b/core/server/common/src/main/java/alluxio/master/journal/raft/BufferedJournalApplier.java
@@ -200,8 +200,9 @@ public AdvanceFuture advance(long sequence) {
       Preconditions.checkState(!mResumeInProgress, "Resume in progress");
       Preconditions.checkState(mAdvanceTask == null || !mAdvanceTask.isAlive(),
           "Advance task in progress.");
-      Preconditions.checkState(sequence >= 0, "Invalid sequence");
-      Preconditions.checkState(mLastAppliedSequence <= sequence, "Can't advance to past.");
+      Preconditions.checkState(sequence >= 0, String.format("Invalid sequence: %d", sequence));
+      Preconditions.checkState(mLastAppliedSequence <= sequence, String.format(
+          "Can't advance to past. Current: %d, Requested: %d", mLastAppliedSequence, sequence));
       LOG.info("Advancing state machine to sequence: {}", sequence);
 
       // Complete the request if already at target sequence.

diff --git a/core/server/common/src/main/java/alluxio/master/journal/ufs/UfsJournal.java b/core/server/common/src/main/java/alluxio/master/journal/ufs/UfsJournal.java
@@ -106,7 +106,7 @@ public class UfsJournal implements Journal {
    */
   private UfsJournalCheckpointThread mTailerThread;
 
-  /** Whether the journal was suspended. */
+  /** Whether the journal is suspended. */
   private volatile boolean mSuspended = false;
   /** Store where the journal was suspended. */
   private volatile long mSuspendSequence = -1;

diff --git a/core/server/master/src/main/java/alluxio/master/backup/BackupWorkerRole.java b/core/server/master/src/main/java/alluxio/master/backup/BackupWorkerRole.java
@@ -259,7 +259,7 @@ private void startHeartbeatThread() {
     }
     // Submit new heartbeat task.
     mBackupProgressFuture = mExecutorService.submit(() -> {
-      do {
+      while (true) {
         // No need to check result because heartbeat will be sent regardless.
         mBackupTracker.waitUntilFinished(mBackupHeartbeatIntervalMs, TimeUnit.MILLISECONDS);
         try {
@@ -273,7 +273,7 @@ private void startHeartbeatThread() {
         if (mBackupTracker.isFinished()) {
           break;
         }
-      } while (true);
+      }
     });
   }