Merge branch 'master' of github.com:ever-been/everBeen

Author: radek-macha

core-data/src/main/java/cz/cuni/mff/d3s/been/core/task/TaskState.java

@@ -96,6 +96,11 @@ public boolean canChangeTo(TaskState state) {
 			return true;
 		}
 
+		// can resubmit on a failed Host Runtime
+		if (this == ACCEPTED && state == SCHEDULED) {
+			return true;
+		}
+
 		return false;
 	}
 }

pom.xml

@@ -54,7 +54,7 @@
 		<maven-plugin-plugin.version>3.2</maven-plugin-plugin.version>
 		<maven-site-plugin.version>3.2</maven-site-plugin.version>
 		<maven-javadoc-plugin.version>2.9.1</maven-javadoc-plugin.version>
-                <maven-source-plugin.version>2.2.1</maven-source-plugin.version>
+		<maven-source-plugin.version>2.2.1</maven-source-plugin.version>
 		<maven-project-info-reports-plugin.version>2.7</maven-project-info-reports-plugin.version>
 		<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
 		<versions-maven-plugin.version>2.0</versions-maven-plugin.version>
@@ -129,7 +129,7 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<version>${maven-javadoc-plugin.version}</version>
-				<configuration>					
+				<configuration>
 					<show>package</show>
 				</configuration>
 			</plugin>
@@ -138,8 +138,9 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<version>${maven-javadoc-plugin.version}</version>
-				<configuration>					
+				<configuration>
 					<show>package</show>
+					<excludePackageNames>cz.cuni.mff.d3s.been.web:cz.cuni.mff.d3s.been.web.*</excludePackageNames>
 				</configuration>
 				<executions>
 					<execution>

task-manager/src/main/java/cz/cuni/mff/d3s/been/manager/LocalKeyScanner.java

@@ -145,7 +145,7 @@ private void checkEntry(final Set<String> runtimesIds, final TaskEntry entry) th
 			String logMsg = String.format("Will reschedule '%s' because of Host Runtime failure", entry.getId());
 			log.debug(logMsg);
 
-			sender.send(Messages.createScheduleTaskMessage(entry));
+			sender.send(Messages.createRescheduleTaskMessage(entry));
 			return;
 		}
 

task-manager/src/main/java/cz/cuni/mff/d3s/been/manager/msg/Messages.java

@@ -53,6 +53,17 @@ public static TaskMessage createScheduleTaskMessage(TaskEntry entry) {
 		return new ScheduleTaskMessage(entry);
 	}
 
+	/**
+	 * Creates RescheduleTaskMessage implementation.
+	 * 
+	 * @param entry
+	 *          targeted task entry
+	 * @return RescheduleTaskMessage implementation
+	 */
+	public static TaskMessage createRescheduleTaskMessage(TaskEntry entry) {
+		return new RescheduleTaskMessage(entry);
+	}
+
 	/**
 	 * Creates CheckSchedulabilityMessage implementation.
 	 * 

task-manager/src/main/java/cz/cuni/mff/d3s/been/manager/msg/RescheduleTaskMessage.java

@@ -0,0 +1,35 @@
+package cz.cuni.mff.d3s.been.manager.msg;
+
+import cz.cuni.mff.d3s.been.cluster.context.ClusterContext;
+import cz.cuni.mff.d3s.been.core.task.TaskEntry;
+import cz.cuni.mff.d3s.been.core.task.TaskState;
+import cz.cuni.mff.d3s.been.manager.action.Actions;
+import cz.cuni.mff.d3s.been.manager.action.TaskAction;
+
+/**
+ * Message which handles task rescheduling.
+ * 
+ * @author Martin Sixta
+ */
+final class RescheduleTaskMessage extends AbstractEntryTaskMessage {
+
+	/**
+	 * Creates RecheduleTaskMessage
+	 * 
+	 * @param entry
+	 *          targeted task entry
+	 */
+	public RescheduleTaskMessage(TaskEntry entry) {
+		super(entry);
+	}
+
+	@Override
+	public TaskAction createAction(ClusterContext ctx) {
+		TaskState state = this.getEntry().getState();
+		if (state == TaskState.SUBMITTED || state == TaskState.ACCEPTED || state == TaskState.WAITING || state == TaskState.SCHEDULED) {
+			return Actions.createScheduleTaskAction(ctx, getEntry());
+		} else {
+			return Actions.createNullAction();
+		}
+	}
+}