You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by jx...@apache.org on 2019/02/26 00:30:36 UTC

[helix] 01/02: Change format to resolve conflict

This is an automated email from the ASF dual-hosted git repository.

jxue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/helix.git

commit 1e74c3bfff137d7afeef9252c8ad74882e29ca53
Author: Junkai Xue <jx...@linkedin.com>
AuthorDate: Mon Feb 25 16:26:10 2019 -0800

    Change format to resolve conflict
---
 helix-core/src/main/java/org/apache/helix/task/JobRebalancer.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/helix-core/src/main/java/org/apache/helix/task/JobRebalancer.java b/helix-core/src/main/java/org/apache/helix/task/JobRebalancer.java
index 11cdf23..ef4e26a 100644
--- a/helix-core/src/main/java/org/apache/helix/task/JobRebalancer.java
+++ b/helix-core/src/main/java/org/apache/helix/task/JobRebalancer.java
@@ -56,8 +56,8 @@ public class JobRebalancer extends TaskRebalancer {
   private JobDispatcher _jobDispatcher;
 
   @Override
-  public ResourceAssignment computeBestPossiblePartitionState(ClusterDataCache clusterData, IdealState taskIs, Resource resource,
-      CurrentStateOutput currStateOutput) {
+  public ResourceAssignment computeBestPossiblePartitionState(ClusterDataCache clusterData, IdealState taskIs,
+      Resource resource, CurrentStateOutput currStateOutput) {
     long startTime = System.currentTimeMillis();
     final String jobName = resource.getResourceName();
     LOG.debug("Computer Best Partition for job: " + jobName);
@@ -70,8 +70,8 @@ public class JobRebalancer extends TaskRebalancer {
     _jobDispatcher.setClusterStatusMonitor(_clusterStatusMonitor);
     ResourceAssignment resourceAssignment =
         _jobDispatcher.processJobStatusUpdateandAssignment(jobName, currStateOutput, taskIs);
-    LOG.debug(String.format("JobRebalancer computation takes %d ms for Job %s", +System.currentTimeMillis() - startTime,
-        jobName));
+    LOG.debug(String.format("JobRebalancer computation takes %d ms for Job %s",
+        System.currentTimeMillis() - startTime, jobName));
     return resourceAssignment;
   }
 }