Merge branch 'checkpointing' into version02

nephele/nephele-clustermanager/pom.xml

@@ -8,10 +8,8 @@
 
  <modelVersion>4.0.0</modelVersion>
 
- <groupId>eu.stratosphere</groupId>
  <artifactId>nephele-clustermanager</artifactId>
  <name>nephele-clustermanager</name>
- <version>0.2</version>
  <url>http:https://maven.apache.org</url>
 
  <dependencies>

nephele/nephele-clustermanager/src/main/java/eu/stratosphere/nephele/instance/cluster/ClusterManager.java

@@ -252,17 +252,17 @@ public void run() {
  }
  }
 
+ registeredHosts.entrySet().removeAll(hostsToRemove);
+
+ updateInstaceTypeDescriptionMap();
+
  final Iterator<Map.Entry<JobID, List<AllocatedResource>>> it = staleResources.entrySet().iterator();
  while (it.hasNext()) {
  final Map.Entry<JobID, List<AllocatedResource>> entry = it.next();
  if (instanceListener != null) {
  instanceListener.allocatedResourcesDied(entry.getKey(), entry.getValue());
  }
  }
-
- registeredHosts.entrySet().removeAll(hostsToRemove);
-
- updateInstaceTypeDescriptionMap();
  }
  }
  };

nephele/nephele-common/pom.xml

@@ -9,9 +9,7 @@
  <version>0.2</version>
  </parent>
 
- <groupId>eu.stratosphere</groupId>
  <artifactId>nephele-common</artifactId>
- <version>0.2</version>
  <name>nephele-common</name>
 
  <packaging>jar</packaging>

nephele/nephele-common/src/main/java/eu/stratosphere/nephele/annotations/ForceCheckpoint.java

@@ -0,0 +1,30 @@
+/***********************************************************************************************************************
+ *
+ * Copyright (C) 2010 by the Stratosphere project (http:https://stratosphere.eu)
+ *
+ * Licensed 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:https://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 eu.stratosphere.nephele.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+/**
+ * Annotation to force a checkpoint-decision.
+ * @author marrus
+ *
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface ForceCheckpoint {
+ boolean checkpoint();
+}

nephele/nephele-common/src/main/java/eu/stratosphere/nephele/annotations/Stateful.java

@@ -0,0 +1,31 @@
+/***********************************************************************************************************************
+ *
+ * Copyright (C) 2010 by the Stratosphere project (http:https://stratosphere.eu)
+ *
+ * Licensed 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:https://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 eu.stratosphere.nephele.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * This annotation can be used to indicate a stateful task.
+ * 
+ * @author marrus
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface Stateful {
+
+}

nephele/nephele-common/src/main/java/eu/stratosphere/nephele/annotations/Stateless.java

@@ -0,0 +1,31 @@
+/***********************************************************************************************************************
+ *
+ * Copyright (C) 2010 by the Stratosphere project (http:https://stratosphere.eu)
+ *
+ * Licensed 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:https://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 eu.stratosphere.nephele.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * This annotation can be used to indicate a stateless task.
+ * 
+ * @author marrus
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface Stateless {
+
+}

nephele/nephele-common/src/main/java/eu/stratosphere/nephele/annotations/TaskAnnotation.java

@@ -0,0 +1,31 @@
+/***********************************************************************************************************************
+ *
+ * Copyright (C) 2010 by the Stratosphere project (http:https://stratosphere.eu)
+ *
+ * Licensed 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:https://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 eu.stratosphere.nephele.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.CONSTRUCTOR)
+public @interface TaskAnnotation {
+
+ boolean statefull();
+ double selektivity() default 1;
+
+}
+