/*
 * Licensed to the University of California, Berkeley under one or more contributor license
 * agreements. See the NOTICE file distributed with this work for additional information regarding
 * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance with the License. You may obtain a
 * copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software distributed under the License
 * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
 * or implied. See the License for the specific language governing permissions and limitations under
 * the License.
 */

package tachyon.heartbeat;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import tachyon.Constants;

/**
 * This class can be used for executing heartbeats periodically.
 */
public final class SleepingTimer implements HeartbeatTimer {
  private static final Logger LOG = LoggerFactory.getLogger(Constants.LOGGER_TYPE);

  private final long mIntervalMs;
  private long mPreviousTickMs;
  private final String mThreadName;

  /**
   * Creates a new instance of {@link SleepingTimer}.
   *
   * @param threadName the thread name
   * @param intervalMs the heartbeat interval
   */
  public SleepingTimer(String threadName, long intervalMs) {
    mIntervalMs = intervalMs;
    mThreadName = threadName;
  }

  /**
   * Enforces the thread waits for the given interval between consecutive ticks.
   *
   * @throws InterruptedException if the thread is interrupted while waiting
   */
  public void tick() throws InterruptedException {
    long executionTimeMs = System.currentTimeMillis() - mPreviousTickMs;
    if (mPreviousTickMs != 0 && executionTimeMs > mIntervalMs) {
      LOG.warn(mThreadName + " last execution took " + executionTimeMs
          + " ms. Longer than the interval " + mIntervalMs);
    } else {
      Thread.sleep(mIntervalMs - executionTimeMs);
    }
    mPreviousTickMs = System.currentTimeMillis();
  }
}

@@ -1729,16 +1729,96 @@
 ption %7B%0A
+    if (mPreviousTickMs == 0) %7B%0A      Thread.sleep(mIntervalMs);%0A    %7D else %7B%0A  
     long
@@ -1890,36 +1890,14 @@
     
+  
 if (
-mPreviousTickMs != 0 && 
 exec
@@ -1931,16 +1931,18 @@
 %7B%0A      
+ 
+ 
 LOG.warn
@@ -2008,16 +2008,18 @@
         
+  
 + %22 ms. 
@@ -2057,32 +2057,34 @@
 ntervalMs);%0A    
+ 
+ 
 %7D else %7B%0A      T
@@ -2072,24 +2072,26 @@
    %7D else %7B%0A
+  
       Thread
@@ -2125,24 +2125,32 @@
 ionTimeMs);%0A
+      %7D%0A
     %7D%0A    mP

Fix the SleepingTimer logic.