You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2014/02/20 06:42:10 UTC
[2/2] git commit: AMBARI-4758. Failure tolerance parameter doesn't
seem to work for Rolling Restarts. Minor tweaks. (swagle)
AMBARI-4758. Failure tolerance parameter doesn't seem to work for Rolling Restarts. Minor tweaks. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9199f1c6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9199f1c6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9199f1c6
Branch: refs/heads/trunk
Commit: 9199f1c608e16b6d3da03f45cf47eabf01e14e54
Parents: b7856cb
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Wed Feb 19 21:41:28 2014 -0800
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Wed Feb 19 21:41:28 2014 -0800
----------------------------------------------------------------------
.../server/scheduler/ExecutionScheduleManager.java | 15 ++++++++++-----
.../server/state/scheduler/BatchRequestJob.java | 2 +-
2 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9199f1c6/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java b/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java
index 83deb06..3623beb 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java
@@ -22,7 +22,10 @@ import com.google.gson.Gson;
import com.google.gson.JsonSyntaxException;
import com.google.inject.Inject;
import com.google.inject.Singleton;
-import com.sun.jersey.api.client.*;
+import com.sun.jersey.api.client.Client;
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.UniformInterfaceException;
+import com.sun.jersey.api.client.WebResource;
import com.sun.jersey.api.client.filter.ClientFilter;
import com.sun.jersey.api.client.filter.CsrfProtectionFilter;
import org.apache.ambari.server.AmbariException;
@@ -43,7 +46,6 @@ import org.apache.ambari.server.state.scheduler.Schedule;
import org.apache.ambari.server.utils.DateUtils;
import org.apache.commons.lang.text.StrBuilder;
import org.quartz.CronExpression;
-import org.quartz.JobDataMap;
import org.quartz.JobDetail;
import org.quartz.JobExecutionContext;
import org.quartz.JobKey;
@@ -51,10 +53,13 @@ import org.quartz.SchedulerException;
import org.quartz.Trigger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import java.text.ParseException;
-import java.util.*;
-
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
import static org.quartz.CronScheduleBuilder.cronSchedule;
import static org.quartz.JobBuilder.newJob;
import static org.quartz.SimpleScheduleBuilder.simpleSchedule;
http://git-wip-us.apache.org/repos/asf/ambari/blob/9199f1c6/ambari-server/src/main/java/org/apache/ambari/server/state/scheduler/BatchRequestJob.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/scheduler/BatchRequestJob.java b/ambari-server/src/main/java/org/apache/ambari/server/state/scheduler/BatchRequestJob.java
index bd52d70..6b571c8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/scheduler/BatchRequestJob.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/scheduler/BatchRequestJob.java
@@ -137,7 +137,7 @@ public class BatchRequestJob extends AbstractLinearExecutionJob {
private Map<String, Integer> addTaskCountToProperties(Map<String, Object> properties,
Map<String, Integer> oldCounts,
- BatchRequestResponse batchRequestResponse) throws AmbariException {
+ BatchRequestResponse batchRequestResponse) {
Map<String, Integer> taskCounts = new HashMap<String, Integer>();