You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by wf...@apache.org on 2014/10/31 01:16:33 UTC
git commit: Document thermos checkpoint files,
include them in git archives.
Repository: incubator-aurora
Updated Branches:
refs/heads/master 349a76dc5 -> 02a1c040e
Document thermos checkpoint files, include them in git archives.
Bugs closed: AURORA-711
Reviewed at https://reviews.apache.org/r/27357/
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/02a1c040
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/02a1c040
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/02a1c040
Branch: refs/heads/master
Commit: 02a1c040e42e4b059f621afe3339f64d5649d390
Parents: 349a76d
Author: Bill Farner <wf...@apache.org>
Authored: Thu Oct 30 17:16:11 2014 -0700
Committer: Bill Farner <wf...@apache.org>
Committed: Thu Oct 30 17:16:11 2014 -0700
----------------------------------------------------------------------
.gitattributes | 1 -
docs/test-resource-generation.md | 25 +++++++++++++++++++
.../root/checkpoints/failure/coordinator.p1 | Bin 162 -> 0 bytes
.../root/checkpoints/failure/coordinator.p2 | Bin 324 -> 0 bytes
.../root/checkpoints/failure/coordinator.p3 | Bin 486 -> 0 bytes
.../thermos/root/checkpoints/failure/runner | Bin 1383 -> 0 bytes
.../checkpoints/failure_limit/coordinator.a | Bin 159 -> 0 bytes
.../checkpoints/failure_limit/coordinator.b | Bin 159 -> 0 bytes
.../root/checkpoints/failure_limit/runner | Bin 589 -> 0 bytes
.../checkpoints/hello_world/coordinator.echo | Bin 168 -> 0 bytes
.../thermos/root/checkpoints/hello_world/runner | Bin 405 -> 0 bytes
.../checkpoints/ordering/coordinator.echo_one | Bin 180 -> 0 bytes
.../checkpoints/ordering/coordinator.echo_three | Bin 186 -> 0 bytes
.../checkpoints/ordering/coordinator.echo_two | Bin 180 -> 0 bytes
.../thermos/root/checkpoints/ordering/runner | Bin 870 -> 0 bytes
.../root/checkpoints/ports/coordinator.echo | Bin 168 -> 0 bytes
.../thermos/root/checkpoints/ports/runner | Bin 433 -> 0 bytes
.../checkpoints/sleep60-lost/coordinator.sleep | Bin 114 -> 0 bytes
.../root/checkpoints/sleep60-lost/runner | Bin 352 -> 0 bytes
.../root/checkpoints/sleep60/coordinator.sleep | Bin 114 -> 0 bytes
.../thermos/root/checkpoints/sleep60/runner | Bin 446 -> 0 bytes
.../thermos/root/logs/failure/p1/0/stdout | 2 --
.../thermos/root/logs/failure/p2/0/stdout | 2 --
.../thermos/root/logs/failure/p2/1/stdout | 2 --
.../thermos/root/logs/failure/p3/0/stdout | 2 --
.../thermos/root/logs/failure/p3/1/stdout | 2 --
.../thermos/root/logs/failure/p3/2/stdout | 2 --
.../thermos/root/logs/failure_limit/a/0/stdout | 1 -
.../thermos/root/logs/hello_world/echo/0/stdout | 1 -
.../root/logs/ordering/echo_one/0/stdout | 1 -
.../root/logs/ordering/echo_three/0/stdout | 1 -
.../root/logs/ordering/echo_two/0/stdout | 1 -
.../thermos/root/logs/ports/echo/0/stdout | 1 -
.../org/apache/thermos/root/sandbox/p1 | 1 -
.../org/apache/thermos/root/sandbox/p2 | 2 --
.../org/apache/thermos/root/sandbox/p3 | 3 ---
.../thermos/root/tasks/active/sleep60-lost | 1 -
.../apache/thermos/root/tasks/finished/failure | 1 -
.../thermos/root/tasks/finished/failure_limit | 1 -
.../thermos/root/tasks/finished/hello_world | 1 -
.../apache/thermos/root/tasks/finished/ordering | 1 -
.../apache/thermos/root/tasks/finished/ports | 1 -
.../apache/thermos/root/tasks/finished/sleep60 | 1 -
.../apache/aurora/executor/test_gc_executor.py | 2 +-
.../org/apache/thermos/root/checkpoints/README | 1 +
.../root/checkpoints/failure/coordinator.p1 | Bin 0 -> 162 bytes
.../root/checkpoints/failure/coordinator.p2 | Bin 0 -> 324 bytes
.../root/checkpoints/failure/coordinator.p3 | Bin 0 -> 486 bytes
.../thermos/root/checkpoints/failure/runner | Bin 0 -> 1383 bytes
.../checkpoints/failure_limit/coordinator.a | Bin 0 -> 159 bytes
.../checkpoints/failure_limit/coordinator.b | Bin 0 -> 159 bytes
.../root/checkpoints/failure_limit/runner | Bin 0 -> 589 bytes
.../checkpoints/hello_world/coordinator.echo | Bin 0 -> 168 bytes
.../thermos/root/checkpoints/hello_world/runner | Bin 0 -> 405 bytes
.../checkpoints/ordering/coordinator.echo_one | Bin 0 -> 180 bytes
.../checkpoints/ordering/coordinator.echo_three | Bin 0 -> 186 bytes
.../checkpoints/ordering/coordinator.echo_two | Bin 0 -> 180 bytes
.../thermos/root/checkpoints/ordering/runner | Bin 0 -> 870 bytes
.../root/checkpoints/ports/coordinator.echo | Bin 0 -> 168 bytes
.../thermos/root/checkpoints/ports/runner | Bin 0 -> 433 bytes
.../checkpoints/sleep60-lost/coordinator.sleep | Bin 0 -> 114 bytes
.../root/checkpoints/sleep60-lost/runner | Bin 0 -> 352 bytes
.../root/checkpoints/sleep60/coordinator.sleep | Bin 0 -> 114 bytes
.../thermos/root/checkpoints/sleep60/runner | Bin 0 -> 446 bytes
.../thermos/root/logs/failure/p1/0/stdout | 2 ++
.../thermos/root/logs/failure/p2/0/stdout | 2 ++
.../thermos/root/logs/failure/p2/1/stdout | 2 ++
.../thermos/root/logs/failure/p3/0/stdout | 2 ++
.../thermos/root/logs/failure/p3/1/stdout | 2 ++
.../thermos/root/logs/failure/p3/2/stdout | 2 ++
.../thermos/root/logs/failure_limit/a/0/stdout | 1 +
.../thermos/root/logs/hello_world/echo/0/stdout | 1 +
.../root/logs/ordering/echo_one/0/stdout | 1 +
.../root/logs/ordering/echo_three/0/stdout | 1 +
.../root/logs/ordering/echo_two/0/stdout | 1 +
.../thermos/root/logs/ports/echo/0/stdout | 1 +
.../org/apache/thermos/root/sandbox/p1 | 1 +
.../org/apache/thermos/root/sandbox/p2 | 2 ++
.../org/apache/thermos/root/sandbox/p3 | 3 +++
.../thermos/root/tasks/active/sleep60-lost | 1 +
.../apache/thermos/root/tasks/finished/failure | 1 +
.../thermos/root/tasks/finished/failure_limit | 1 +
.../thermos/root/tasks/finished/hello_world | 1 +
.../apache/thermos/root/tasks/finished/ordering | 1 +
.../apache/thermos/root/tasks/finished/ports | 1 +
.../apache/thermos/root/tasks/finished/sleep60 | 1 +
86 files changed, 58 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/.gitattributes
----------------------------------------------------------------------
diff --git a/.gitattributes b/.gitattributes
index 8d50d05..a5ab8cf 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,5 @@
/gradlew export-ignore
/gradle export-ignore
-/src/resources export-ignore
*.pyc export-ignore
*.zip export-ignore
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/docs/test-resource-generation.md
----------------------------------------------------------------------
diff --git a/docs/test-resource-generation.md b/docs/test-resource-generation.md
new file mode 100644
index 0000000..335586d
--- /dev/null
+++ b/docs/test-resource-generation.md
@@ -0,0 +1,25 @@
+# Generating test resources
+
+## Background
+The Aurora source repository and distributions contain several
+[binary files](../src/test/resources/org/apache/thermos/root/checkpoints) to
+qualify the backwards-compatibility of thermos with checkpoint data. Since
+thermos persists state to disk, to be read by other components (the GC executor
+and the thermos observer), it is important that we have tests that prevent
+regressions affecting the ability to parse previously-written data.
+
+## Generating test files
+The files included represent persisted checkpoints that exercise different
+features of thermos. The existing files should not be modified unless
+we are accepting backwards incompatibility, such as with a major release.
+
+It is not practical to write source code to generate these files on the fly,
+as source would be vulnerable to drift (e.g. due to refactoring) in ways
+that would undermine the goal of ensuring backwards compatibility.
+
+The most common reason to add a new checkpoint file would be to provide
+coverage for new thermos features that alter the data format. This is
+accomplished by writing and running a
+[job configuration](configuration-reference.md) that exercises the feature, and
+copying the checkpoint file from the sandbox directory, by default this is
+`/var/run/thermos/checkpoints/<aurora task id>`.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/checkpoints/failure/coordinator.p1
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/checkpoints/failure/coordinator.p1 b/src/resources/org/apache/thermos/root/checkpoints/failure/coordinator.p1
deleted file mode 100644
index adc6886..0000000
Binary files a/src/resources/org/apache/thermos/root/checkpoints/failure/coordinator.p1 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/checkpoints/failure/coordinator.p2
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/checkpoints/failure/coordinator.p2 b/src/resources/org/apache/thermos/root/checkpoints/failure/coordinator.p2
deleted file mode 100644
index 1acab13..0000000
Binary files a/src/resources/org/apache/thermos/root/checkpoints/failure/coordinator.p2 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/checkpoints/failure/coordinator.p3
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/checkpoints/failure/coordinator.p3 b/src/resources/org/apache/thermos/root/checkpoints/failure/coordinator.p3
deleted file mode 100644
index b0ca893..0000000
Binary files a/src/resources/org/apache/thermos/root/checkpoints/failure/coordinator.p3 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/checkpoints/failure/runner
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/checkpoints/failure/runner b/src/resources/org/apache/thermos/root/checkpoints/failure/runner
deleted file mode 100644
index 423c4af..0000000
Binary files a/src/resources/org/apache/thermos/root/checkpoints/failure/runner and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/checkpoints/failure_limit/coordinator.a
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/checkpoints/failure_limit/coordinator.a b/src/resources/org/apache/thermos/root/checkpoints/failure_limit/coordinator.a
deleted file mode 100644
index 7411d0c..0000000
Binary files a/src/resources/org/apache/thermos/root/checkpoints/failure_limit/coordinator.a and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/checkpoints/failure_limit/coordinator.b
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/checkpoints/failure_limit/coordinator.b b/src/resources/org/apache/thermos/root/checkpoints/failure_limit/coordinator.b
deleted file mode 100644
index 1605af1..0000000
Binary files a/src/resources/org/apache/thermos/root/checkpoints/failure_limit/coordinator.b and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/checkpoints/failure_limit/runner
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/checkpoints/failure_limit/runner b/src/resources/org/apache/thermos/root/checkpoints/failure_limit/runner
deleted file mode 100644
index cd35c08..0000000
Binary files a/src/resources/org/apache/thermos/root/checkpoints/failure_limit/runner and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/checkpoints/hello_world/coordinator.echo
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/checkpoints/hello_world/coordinator.echo b/src/resources/org/apache/thermos/root/checkpoints/hello_world/coordinator.echo
deleted file mode 100644
index b986646..0000000
Binary files a/src/resources/org/apache/thermos/root/checkpoints/hello_world/coordinator.echo and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/checkpoints/hello_world/runner
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/checkpoints/hello_world/runner b/src/resources/org/apache/thermos/root/checkpoints/hello_world/runner
deleted file mode 100644
index 09093fd..0000000
Binary files a/src/resources/org/apache/thermos/root/checkpoints/hello_world/runner and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/checkpoints/ordering/coordinator.echo_one
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/checkpoints/ordering/coordinator.echo_one b/src/resources/org/apache/thermos/root/checkpoints/ordering/coordinator.echo_one
deleted file mode 100644
index eb32451..0000000
Binary files a/src/resources/org/apache/thermos/root/checkpoints/ordering/coordinator.echo_one and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/checkpoints/ordering/coordinator.echo_three
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/checkpoints/ordering/coordinator.echo_three b/src/resources/org/apache/thermos/root/checkpoints/ordering/coordinator.echo_three
deleted file mode 100644
index f7b2512..0000000
Binary files a/src/resources/org/apache/thermos/root/checkpoints/ordering/coordinator.echo_three and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/checkpoints/ordering/coordinator.echo_two
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/checkpoints/ordering/coordinator.echo_two b/src/resources/org/apache/thermos/root/checkpoints/ordering/coordinator.echo_two
deleted file mode 100644
index 4b4ce8f..0000000
Binary files a/src/resources/org/apache/thermos/root/checkpoints/ordering/coordinator.echo_two and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/checkpoints/ordering/runner
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/checkpoints/ordering/runner b/src/resources/org/apache/thermos/root/checkpoints/ordering/runner
deleted file mode 100644
index 11fdb1b..0000000
Binary files a/src/resources/org/apache/thermos/root/checkpoints/ordering/runner and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/checkpoints/ports/coordinator.echo
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/checkpoints/ports/coordinator.echo b/src/resources/org/apache/thermos/root/checkpoints/ports/coordinator.echo
deleted file mode 100644
index f460fdc..0000000
Binary files a/src/resources/org/apache/thermos/root/checkpoints/ports/coordinator.echo and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/checkpoints/ports/runner
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/checkpoints/ports/runner b/src/resources/org/apache/thermos/root/checkpoints/ports/runner
deleted file mode 100644
index e7cce51..0000000
Binary files a/src/resources/org/apache/thermos/root/checkpoints/ports/runner and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/checkpoints/sleep60-lost/coordinator.sleep
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/checkpoints/sleep60-lost/coordinator.sleep b/src/resources/org/apache/thermos/root/checkpoints/sleep60-lost/coordinator.sleep
deleted file mode 100644
index 4bcec34..0000000
Binary files a/src/resources/org/apache/thermos/root/checkpoints/sleep60-lost/coordinator.sleep and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/checkpoints/sleep60-lost/runner
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/checkpoints/sleep60-lost/runner b/src/resources/org/apache/thermos/root/checkpoints/sleep60-lost/runner
deleted file mode 100644
index 50c70c2..0000000
Binary files a/src/resources/org/apache/thermos/root/checkpoints/sleep60-lost/runner and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/checkpoints/sleep60/coordinator.sleep
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/checkpoints/sleep60/coordinator.sleep b/src/resources/org/apache/thermos/root/checkpoints/sleep60/coordinator.sleep
deleted file mode 100644
index 78d1375..0000000
Binary files a/src/resources/org/apache/thermos/root/checkpoints/sleep60/coordinator.sleep and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/checkpoints/sleep60/runner
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/checkpoints/sleep60/runner b/src/resources/org/apache/thermos/root/checkpoints/sleep60/runner
deleted file mode 100644
index 0d3c701..0000000
Binary files a/src/resources/org/apache/thermos/root/checkpoints/sleep60/runner and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/logs/failure/p1/0/stdout
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/logs/failure/p1/0/stdout b/src/resources/org/apache/thermos/root/logs/failure/p1/0/stdout
deleted file mode 100644
index 62fa342..0000000
--- a/src/resources/org/apache/thermos/root/logs/failure/p1/0/stdout
+++ /dev/null
@@ -1,2 +0,0 @@
-p1 pinging
-current count 1
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/logs/failure/p2/0/stdout
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/logs/failure/p2/0/stdout b/src/resources/org/apache/thermos/root/logs/failure/p2/0/stdout
deleted file mode 100644
index 6faf6a6..0000000
--- a/src/resources/org/apache/thermos/root/logs/failure/p2/0/stdout
+++ /dev/null
@@ -1,2 +0,0 @@
-p2 pinging
-current count 1
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/logs/failure/p2/1/stdout
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/logs/failure/p2/1/stdout b/src/resources/org/apache/thermos/root/logs/failure/p2/1/stdout
deleted file mode 100644
index 6a3dc00..0000000
--- a/src/resources/org/apache/thermos/root/logs/failure/p2/1/stdout
+++ /dev/null
@@ -1,2 +0,0 @@
-p2 pinging
-current count 2
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/logs/failure/p3/0/stdout
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/logs/failure/p3/0/stdout b/src/resources/org/apache/thermos/root/logs/failure/p3/0/stdout
deleted file mode 100644
index c70f82d..0000000
--- a/src/resources/org/apache/thermos/root/logs/failure/p3/0/stdout
+++ /dev/null
@@ -1,2 +0,0 @@
-p3 pinging
-current count 1
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/logs/failure/p3/1/stdout
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/logs/failure/p3/1/stdout b/src/resources/org/apache/thermos/root/logs/failure/p3/1/stdout
deleted file mode 100644
index 09848b5..0000000
--- a/src/resources/org/apache/thermos/root/logs/failure/p3/1/stdout
+++ /dev/null
@@ -1,2 +0,0 @@
-p3 pinging
-current count 2
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/logs/failure/p3/2/stdout
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/logs/failure/p3/2/stdout b/src/resources/org/apache/thermos/root/logs/failure/p3/2/stdout
deleted file mode 100644
index 1de184d..0000000
--- a/src/resources/org/apache/thermos/root/logs/failure/p3/2/stdout
+++ /dev/null
@@ -1,2 +0,0 @@
-p3 pinging
-current count 3
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/logs/failure_limit/a/0/stdout
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/logs/failure_limit/a/0/stdout b/src/resources/org/apache/thermos/root/logs/failure_limit/a/0/stdout
deleted file mode 100644
index 3b18e51..0000000
--- a/src/resources/org/apache/thermos/root/logs/failure_limit/a/0/stdout
+++ /dev/null
@@ -1 +0,0 @@
-hello world
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/logs/hello_world/echo/0/stdout
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/logs/hello_world/echo/0/stdout b/src/resources/org/apache/thermos/root/logs/hello_world/echo/0/stdout
deleted file mode 100644
index 3b18e51..0000000
--- a/src/resources/org/apache/thermos/root/logs/hello_world/echo/0/stdout
+++ /dev/null
@@ -1 +0,0 @@
-hello world
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/logs/ordering/echo_one/0/stdout
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/logs/ordering/echo_one/0/stdout b/src/resources/org/apache/thermos/root/logs/ordering/echo_one/0/stdout
deleted file mode 100644
index bd1ced8..0000000
--- a/src/resources/org/apache/thermos/root/logs/ordering/echo_one/0/stdout
+++ /dev/null
@@ -1 +0,0 @@
-hello brian
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/logs/ordering/echo_three/0/stdout
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/logs/ordering/echo_three/0/stdout b/src/resources/org/apache/thermos/root/logs/ordering/echo_three/0/stdout
deleted file mode 100644
index bbb02af..0000000
--- a/src/resources/org/apache/thermos/root/logs/ordering/echo_three/0/stdout
+++ /dev/null
@@ -1 +0,0 @@
-hello bill
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/logs/ordering/echo_two/0/stdout
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/logs/ordering/echo_two/0/stdout b/src/resources/org/apache/thermos/root/logs/ordering/echo_two/0/stdout
deleted file mode 100644
index 0f07a6a..0000000
--- a/src/resources/org/apache/thermos/root/logs/ordering/echo_two/0/stdout
+++ /dev/null
@@ -1 +0,0 @@
-hello john
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/logs/ports/echo/0/stdout
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/logs/ports/echo/0/stdout b/src/resources/org/apache/thermos/root/logs/ports/echo/0/stdout
deleted file mode 100644
index 8bc55f9..0000000
--- a/src/resources/org/apache/thermos/root/logs/ports/echo/0/stdout
+++ /dev/null
@@ -1 +0,0 @@
-50000 50001
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/sandbox/p1
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/sandbox/p1 b/src/resources/org/apache/thermos/root/sandbox/p1
deleted file mode 100644
index f68190a..0000000
--- a/src/resources/org/apache/thermos/root/sandbox/p1
+++ /dev/null
@@ -1 +0,0 @@
-ping
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/sandbox/p2
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/sandbox/p2 b/src/resources/org/apache/thermos/root/sandbox/p2
deleted file mode 100644
index c06ef8e..0000000
--- a/src/resources/org/apache/thermos/root/sandbox/p2
+++ /dev/null
@@ -1,2 +0,0 @@
-ping
-ping
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/sandbox/p3
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/sandbox/p3 b/src/resources/org/apache/thermos/root/sandbox/p3
deleted file mode 100644
index 6bc16b8..0000000
--- a/src/resources/org/apache/thermos/root/sandbox/p3
+++ /dev/null
@@ -1,3 +0,0 @@
-ping
-ping
-ping
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/tasks/active/sleep60-lost
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/tasks/active/sleep60-lost b/src/resources/org/apache/thermos/root/tasks/active/sleep60-lost
deleted file mode 100644
index 71562af..0000000
--- a/src/resources/org/apache/thermos/root/tasks/active/sleep60-lost
+++ /dev/null
@@ -1 +0,0 @@
-{"processes": [{"cmdline": "sleep 60; echo hello world", "daemon": 0, "max_failures": 1, "name": "sleep"}], "name": "sleep", "max_failures": 1, "min_successes": 0, "max_concurrency": 0, "resources": {"disk": 0, "best_effort": 0, "ram": 8388608, "cpu": 0.01}, "user": "{{thermos.user}}"}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/tasks/finished/failure
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/tasks/finished/failure b/src/resources/org/apache/thermos/root/tasks/finished/failure
deleted file mode 100644
index 3362204..0000000
--- a/src/resources/org/apache/thermos/root/tasks/finished/failure
+++ /dev/null
@@ -1 +0,0 @@
-{"processes": [{"cmdline": "echo p1 pinging; echo ping >> p1; echo current count $(cat p1 | wc -l); if [ $(cat p1 | wc -l) -eq 1 ]; then exit 0; else exit 1; fi ", "daemon": 0, "max_failures": 5, "name": "p1"}, {"cmdline": "echo p2 pinging; echo ping >> p2; echo current count $(cat p2 | wc -l); if [ $(cat p2 | wc -l) -eq 2 ]; then exit 0; else exit 1; fi ", "daemon": 0, "max_failures": 5, "name": "p2"}, {"cmdline": "echo p3 pinging; e
cho ping >> p3; echo current count $(cat p3 | wc -l); if [ $(cat p3 | wc -l) -eq 3 ]; then exit 0; else exit 1; fi ", "daemon": 0, "max_failures": 5, "name": "p3"}], "name": "pingping", "max_failures": 1, "user": "{{thermos.user}}", "max_concurrency": 0, "resources": {"disk": 16384, "ram": 16777216, "cpu": 1.0}}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/tasks/finished/failure_limit
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/tasks/finished/failure_limit b/src/resources/org/apache/thermos/root/tasks/finished/failure_limit
deleted file mode 100644
index 642c4a8..0000000
--- a/src/resources/org/apache/thermos/root/tasks/finished/failure_limit
+++ /dev/null
@@ -1 +0,0 @@
-{"processes": [{"cmdline": "echo hello world", "daemon": 0, "max_failures": 1, "name": "a"}, {"cmdline": "exit 1", "daemon": 0, "max_failures": 1, "name": "b"}, {"cmdline": "echo hello world", "daemon": 0, "max_failures": 1, "name": "c"}], "name": "failing_task", "max_failures": 2, "user": "{{thermos.user}}", "max_concurrency": 0, "resources": {"disk": 16384, "ram": 16777216, "cpu": 1.0}, "constraints": [{"order": ["a", "b", "c"]}]}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/tasks/finished/hello_world
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/tasks/finished/hello_world b/src/resources/org/apache/thermos/root/tasks/finished/hello_world
deleted file mode 100644
index c331c53..0000000
--- a/src/resources/org/apache/thermos/root/tasks/finished/hello_world
+++ /dev/null
@@ -1 +0,0 @@
-{"processes": [{"cmdline": "echo hello world", "daemon": 0, "max_failures": 1, "name": "echo"}], "name": "echo", "max_failures": 1, "user": "{{thermos.user}}", "max_concurrency": 0, "resources": {"disk": 0, "ram": 8388608, "cpu": 0.01}}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/tasks/finished/ordering
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/tasks/finished/ordering b/src/resources/org/apache/thermos/root/tasks/finished/ordering
deleted file mode 100644
index 6774dc0..0000000
--- a/src/resources/org/apache/thermos/root/tasks/finished/ordering
+++ /dev/null
@@ -1 +0,0 @@
-{"processes": [{"cmdline": "sleep 60; echo hello brian", "daemon": 0, "max_failures": 1, "name": "echo_one"}, {"cmdline": "sleep 60; echo hello john", "daemon": 0, "max_failures": 1, "name": "echo_two"}, {"cmdline": "sleep 60; echo hello bill", "daemon": 0, "max_failures": 1, "name": "echo_three"}], "name": "echo_complex", "max_failures": 1, "user": "{{thermos.user}}", "max_concurrency": 0, "resources": {"disk": 1048576, "ram": 1048576, "cpu": 0.10000000000000001}, "constraints": [{"order": ["echo_one", "echo_two", "echo_three"]}]}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/tasks/finished/ports
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/tasks/finished/ports b/src/resources/org/apache/thermos/root/tasks/finished/ports
deleted file mode 100644
index 080ee71..0000000
--- a/src/resources/org/apache/thermos/root/tasks/finished/ports
+++ /dev/null
@@ -1 +0,0 @@
-{"processes": [{"cmdline": "echo {{thermos.ports[hello]}} {{thermos.ports[world]}}", "daemon": 0, "max_failures": 1, "name": "echo"}], "name": "echo", "max_failures": 1, "user": "{{thermos.user}}", "max_concurrency": 0, "resources": {"disk": 0, "ram": 8388608, "cpu": 0.01}}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/resources/org/apache/thermos/root/tasks/finished/sleep60
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/thermos/root/tasks/finished/sleep60 b/src/resources/org/apache/thermos/root/tasks/finished/sleep60
deleted file mode 100644
index 7c7dc47..0000000
--- a/src/resources/org/apache/thermos/root/tasks/finished/sleep60
+++ /dev/null
@@ -1 +0,0 @@
-{"processes": [{"cmdline": "sleep 60; echo hello world", "daemon": 0, "max_failures": 1, "name": "sleep"}], "name": "sleep", "max_failures": 1, "user": "{{thermos.user}}", "max_concurrency": 0, "resources": {"disk": 0, "ram": 8388608, "cpu": 0.01}}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/python/apache/aurora/executor/test_gc_executor.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/test_gc_executor.py b/src/test/python/apache/aurora/executor/test_gc_executor.py
index 85afe50..b1bbc89 100644
--- a/src/test/python/apache/aurora/executor/test_gc_executor.py
+++ b/src/test/python/apache/aurora/executor/test_gc_executor.py
@@ -77,7 +77,7 @@ def setup_tree(td, lose=False):
safe_rmtree(td)
# TODO(wickman) These should be referred as resources= in the python_target instead.
- shutil.copytree('src/resources/org/apache/thermos/root', td)
+ shutil.copytree('src/test/resources/org/apache/thermos/root', td)
if lose:
lost_age = time.time() - (
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/checkpoints/README
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/checkpoints/README b/src/test/resources/org/apache/thermos/root/checkpoints/README
new file mode 100644
index 0000000..2a57f57
--- /dev/null
+++ b/src/test/resources/org/apache/thermos/root/checkpoints/README
@@ -0,0 +1 @@
+For details on these files, see docs/test-resource-generation.md.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/checkpoints/failure/coordinator.p1
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/checkpoints/failure/coordinator.p1 b/src/test/resources/org/apache/thermos/root/checkpoints/failure/coordinator.p1
new file mode 100644
index 0000000..adc6886
Binary files /dev/null and b/src/test/resources/org/apache/thermos/root/checkpoints/failure/coordinator.p1 differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/checkpoints/failure/coordinator.p2
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/checkpoints/failure/coordinator.p2 b/src/test/resources/org/apache/thermos/root/checkpoints/failure/coordinator.p2
new file mode 100644
index 0000000..1acab13
Binary files /dev/null and b/src/test/resources/org/apache/thermos/root/checkpoints/failure/coordinator.p2 differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/checkpoints/failure/coordinator.p3
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/checkpoints/failure/coordinator.p3 b/src/test/resources/org/apache/thermos/root/checkpoints/failure/coordinator.p3
new file mode 100644
index 0000000..b0ca893
Binary files /dev/null and b/src/test/resources/org/apache/thermos/root/checkpoints/failure/coordinator.p3 differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/checkpoints/failure/runner
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/checkpoints/failure/runner b/src/test/resources/org/apache/thermos/root/checkpoints/failure/runner
new file mode 100644
index 0000000..423c4af
Binary files /dev/null and b/src/test/resources/org/apache/thermos/root/checkpoints/failure/runner differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/checkpoints/failure_limit/coordinator.a
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/checkpoints/failure_limit/coordinator.a b/src/test/resources/org/apache/thermos/root/checkpoints/failure_limit/coordinator.a
new file mode 100644
index 0000000..7411d0c
Binary files /dev/null and b/src/test/resources/org/apache/thermos/root/checkpoints/failure_limit/coordinator.a differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/checkpoints/failure_limit/coordinator.b
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/checkpoints/failure_limit/coordinator.b b/src/test/resources/org/apache/thermos/root/checkpoints/failure_limit/coordinator.b
new file mode 100644
index 0000000..1605af1
Binary files /dev/null and b/src/test/resources/org/apache/thermos/root/checkpoints/failure_limit/coordinator.b differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/checkpoints/failure_limit/runner
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/checkpoints/failure_limit/runner b/src/test/resources/org/apache/thermos/root/checkpoints/failure_limit/runner
new file mode 100644
index 0000000..cd35c08
Binary files /dev/null and b/src/test/resources/org/apache/thermos/root/checkpoints/failure_limit/runner differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/checkpoints/hello_world/coordinator.echo
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/checkpoints/hello_world/coordinator.echo b/src/test/resources/org/apache/thermos/root/checkpoints/hello_world/coordinator.echo
new file mode 100644
index 0000000..b986646
Binary files /dev/null and b/src/test/resources/org/apache/thermos/root/checkpoints/hello_world/coordinator.echo differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/checkpoints/hello_world/runner
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/checkpoints/hello_world/runner b/src/test/resources/org/apache/thermos/root/checkpoints/hello_world/runner
new file mode 100644
index 0000000..09093fd
Binary files /dev/null and b/src/test/resources/org/apache/thermos/root/checkpoints/hello_world/runner differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/checkpoints/ordering/coordinator.echo_one
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/checkpoints/ordering/coordinator.echo_one b/src/test/resources/org/apache/thermos/root/checkpoints/ordering/coordinator.echo_one
new file mode 100644
index 0000000..eb32451
Binary files /dev/null and b/src/test/resources/org/apache/thermos/root/checkpoints/ordering/coordinator.echo_one differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/checkpoints/ordering/coordinator.echo_three
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/checkpoints/ordering/coordinator.echo_three b/src/test/resources/org/apache/thermos/root/checkpoints/ordering/coordinator.echo_three
new file mode 100644
index 0000000..f7b2512
Binary files /dev/null and b/src/test/resources/org/apache/thermos/root/checkpoints/ordering/coordinator.echo_three differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/checkpoints/ordering/coordinator.echo_two
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/checkpoints/ordering/coordinator.echo_two b/src/test/resources/org/apache/thermos/root/checkpoints/ordering/coordinator.echo_two
new file mode 100644
index 0000000..4b4ce8f
Binary files /dev/null and b/src/test/resources/org/apache/thermos/root/checkpoints/ordering/coordinator.echo_two differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/checkpoints/ordering/runner
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/checkpoints/ordering/runner b/src/test/resources/org/apache/thermos/root/checkpoints/ordering/runner
new file mode 100644
index 0000000..11fdb1b
Binary files /dev/null and b/src/test/resources/org/apache/thermos/root/checkpoints/ordering/runner differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/checkpoints/ports/coordinator.echo
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/checkpoints/ports/coordinator.echo b/src/test/resources/org/apache/thermos/root/checkpoints/ports/coordinator.echo
new file mode 100644
index 0000000..f460fdc
Binary files /dev/null and b/src/test/resources/org/apache/thermos/root/checkpoints/ports/coordinator.echo differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/checkpoints/ports/runner
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/checkpoints/ports/runner b/src/test/resources/org/apache/thermos/root/checkpoints/ports/runner
new file mode 100644
index 0000000..e7cce51
Binary files /dev/null and b/src/test/resources/org/apache/thermos/root/checkpoints/ports/runner differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/checkpoints/sleep60-lost/coordinator.sleep
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/checkpoints/sleep60-lost/coordinator.sleep b/src/test/resources/org/apache/thermos/root/checkpoints/sleep60-lost/coordinator.sleep
new file mode 100644
index 0000000..4bcec34
Binary files /dev/null and b/src/test/resources/org/apache/thermos/root/checkpoints/sleep60-lost/coordinator.sleep differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/checkpoints/sleep60-lost/runner
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/checkpoints/sleep60-lost/runner b/src/test/resources/org/apache/thermos/root/checkpoints/sleep60-lost/runner
new file mode 100644
index 0000000..50c70c2
Binary files /dev/null and b/src/test/resources/org/apache/thermos/root/checkpoints/sleep60-lost/runner differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/checkpoints/sleep60/coordinator.sleep
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/checkpoints/sleep60/coordinator.sleep b/src/test/resources/org/apache/thermos/root/checkpoints/sleep60/coordinator.sleep
new file mode 100644
index 0000000..78d1375
Binary files /dev/null and b/src/test/resources/org/apache/thermos/root/checkpoints/sleep60/coordinator.sleep differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/checkpoints/sleep60/runner
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/checkpoints/sleep60/runner b/src/test/resources/org/apache/thermos/root/checkpoints/sleep60/runner
new file mode 100644
index 0000000..0d3c701
Binary files /dev/null and b/src/test/resources/org/apache/thermos/root/checkpoints/sleep60/runner differ
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/logs/failure/p1/0/stdout
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/logs/failure/p1/0/stdout b/src/test/resources/org/apache/thermos/root/logs/failure/p1/0/stdout
new file mode 100644
index 0000000..62fa342
--- /dev/null
+++ b/src/test/resources/org/apache/thermos/root/logs/failure/p1/0/stdout
@@ -0,0 +1,2 @@
+p1 pinging
+current count 1
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/logs/failure/p2/0/stdout
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/logs/failure/p2/0/stdout b/src/test/resources/org/apache/thermos/root/logs/failure/p2/0/stdout
new file mode 100644
index 0000000..6faf6a6
--- /dev/null
+++ b/src/test/resources/org/apache/thermos/root/logs/failure/p2/0/stdout
@@ -0,0 +1,2 @@
+p2 pinging
+current count 1
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/logs/failure/p2/1/stdout
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/logs/failure/p2/1/stdout b/src/test/resources/org/apache/thermos/root/logs/failure/p2/1/stdout
new file mode 100644
index 0000000..6a3dc00
--- /dev/null
+++ b/src/test/resources/org/apache/thermos/root/logs/failure/p2/1/stdout
@@ -0,0 +1,2 @@
+p2 pinging
+current count 2
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/logs/failure/p3/0/stdout
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/logs/failure/p3/0/stdout b/src/test/resources/org/apache/thermos/root/logs/failure/p3/0/stdout
new file mode 100644
index 0000000..c70f82d
--- /dev/null
+++ b/src/test/resources/org/apache/thermos/root/logs/failure/p3/0/stdout
@@ -0,0 +1,2 @@
+p3 pinging
+current count 1
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/logs/failure/p3/1/stdout
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/logs/failure/p3/1/stdout b/src/test/resources/org/apache/thermos/root/logs/failure/p3/1/stdout
new file mode 100644
index 0000000..09848b5
--- /dev/null
+++ b/src/test/resources/org/apache/thermos/root/logs/failure/p3/1/stdout
@@ -0,0 +1,2 @@
+p3 pinging
+current count 2
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/logs/failure/p3/2/stdout
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/logs/failure/p3/2/stdout b/src/test/resources/org/apache/thermos/root/logs/failure/p3/2/stdout
new file mode 100644
index 0000000..1de184d
--- /dev/null
+++ b/src/test/resources/org/apache/thermos/root/logs/failure/p3/2/stdout
@@ -0,0 +1,2 @@
+p3 pinging
+current count 3
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/logs/failure_limit/a/0/stdout
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/logs/failure_limit/a/0/stdout b/src/test/resources/org/apache/thermos/root/logs/failure_limit/a/0/stdout
new file mode 100644
index 0000000..3b18e51
--- /dev/null
+++ b/src/test/resources/org/apache/thermos/root/logs/failure_limit/a/0/stdout
@@ -0,0 +1 @@
+hello world
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/logs/hello_world/echo/0/stdout
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/logs/hello_world/echo/0/stdout b/src/test/resources/org/apache/thermos/root/logs/hello_world/echo/0/stdout
new file mode 100644
index 0000000..3b18e51
--- /dev/null
+++ b/src/test/resources/org/apache/thermos/root/logs/hello_world/echo/0/stdout
@@ -0,0 +1 @@
+hello world
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/logs/ordering/echo_one/0/stdout
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/logs/ordering/echo_one/0/stdout b/src/test/resources/org/apache/thermos/root/logs/ordering/echo_one/0/stdout
new file mode 100644
index 0000000..bd1ced8
--- /dev/null
+++ b/src/test/resources/org/apache/thermos/root/logs/ordering/echo_one/0/stdout
@@ -0,0 +1 @@
+hello brian
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/logs/ordering/echo_three/0/stdout
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/logs/ordering/echo_three/0/stdout b/src/test/resources/org/apache/thermos/root/logs/ordering/echo_three/0/stdout
new file mode 100644
index 0000000..bbb02af
--- /dev/null
+++ b/src/test/resources/org/apache/thermos/root/logs/ordering/echo_three/0/stdout
@@ -0,0 +1 @@
+hello bill
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/logs/ordering/echo_two/0/stdout
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/logs/ordering/echo_two/0/stdout b/src/test/resources/org/apache/thermos/root/logs/ordering/echo_two/0/stdout
new file mode 100644
index 0000000..0f07a6a
--- /dev/null
+++ b/src/test/resources/org/apache/thermos/root/logs/ordering/echo_two/0/stdout
@@ -0,0 +1 @@
+hello john
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/logs/ports/echo/0/stdout
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/logs/ports/echo/0/stdout b/src/test/resources/org/apache/thermos/root/logs/ports/echo/0/stdout
new file mode 100644
index 0000000..8bc55f9
--- /dev/null
+++ b/src/test/resources/org/apache/thermos/root/logs/ports/echo/0/stdout
@@ -0,0 +1 @@
+50000 50001
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/sandbox/p1
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/sandbox/p1 b/src/test/resources/org/apache/thermos/root/sandbox/p1
new file mode 100644
index 0000000..f68190a
--- /dev/null
+++ b/src/test/resources/org/apache/thermos/root/sandbox/p1
@@ -0,0 +1 @@
+ping
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/sandbox/p2
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/sandbox/p2 b/src/test/resources/org/apache/thermos/root/sandbox/p2
new file mode 100644
index 0000000..c06ef8e
--- /dev/null
+++ b/src/test/resources/org/apache/thermos/root/sandbox/p2
@@ -0,0 +1,2 @@
+ping
+ping
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/sandbox/p3
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/sandbox/p3 b/src/test/resources/org/apache/thermos/root/sandbox/p3
new file mode 100644
index 0000000..6bc16b8
--- /dev/null
+++ b/src/test/resources/org/apache/thermos/root/sandbox/p3
@@ -0,0 +1,3 @@
+ping
+ping
+ping
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/tasks/active/sleep60-lost
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/tasks/active/sleep60-lost b/src/test/resources/org/apache/thermos/root/tasks/active/sleep60-lost
new file mode 100644
index 0000000..71562af
--- /dev/null
+++ b/src/test/resources/org/apache/thermos/root/tasks/active/sleep60-lost
@@ -0,0 +1 @@
+{"processes": [{"cmdline": "sleep 60; echo hello world", "daemon": 0, "max_failures": 1, "name": "sleep"}], "name": "sleep", "max_failures": 1, "min_successes": 0, "max_concurrency": 0, "resources": {"disk": 0, "best_effort": 0, "ram": 8388608, "cpu": 0.01}, "user": "{{thermos.user}}"}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/tasks/finished/failure
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/tasks/finished/failure b/src/test/resources/org/apache/thermos/root/tasks/finished/failure
new file mode 100644
index 0000000..3362204
--- /dev/null
+++ b/src/test/resources/org/apache/thermos/root/tasks/finished/failure
@@ -0,0 +1 @@
+{"processes": [{"cmdline": "echo p1 pinging; echo ping >> p1; echo current count $(cat p1 | wc -l); if [ $(cat p1 | wc -l) -eq 1 ]; then exit 0; else exit 1; fi ", "daemon": 0, "max_failures": 5, "name": "p1"}, {"cmdline": "echo p2 pinging; echo ping >> p2; echo current count $(cat p2 | wc -l); if [ $(cat p2 | wc -l) -eq 2 ]; then exit 0; else exit 1; fi ", "daemon": 0, "max_failures": 5, "name": "p2"}, {"cmdline": "echo p3 pinging; e
cho ping >> p3; echo current count $(cat p3 | wc -l); if [ $(cat p3 | wc -l) -eq 3 ]; then exit 0; else exit 1; fi ", "daemon": 0, "max_failures": 5, "name": "p3"}], "name": "pingping", "max_failures": 1, "user": "{{thermos.user}}", "max_concurrency": 0, "resources": {"disk": 16384, "ram": 16777216, "cpu": 1.0}}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/tasks/finished/failure_limit
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/tasks/finished/failure_limit b/src/test/resources/org/apache/thermos/root/tasks/finished/failure_limit
new file mode 100644
index 0000000..642c4a8
--- /dev/null
+++ b/src/test/resources/org/apache/thermos/root/tasks/finished/failure_limit
@@ -0,0 +1 @@
+{"processes": [{"cmdline": "echo hello world", "daemon": 0, "max_failures": 1, "name": "a"}, {"cmdline": "exit 1", "daemon": 0, "max_failures": 1, "name": "b"}, {"cmdline": "echo hello world", "daemon": 0, "max_failures": 1, "name": "c"}], "name": "failing_task", "max_failures": 2, "user": "{{thermos.user}}", "max_concurrency": 0, "resources": {"disk": 16384, "ram": 16777216, "cpu": 1.0}, "constraints": [{"order": ["a", "b", "c"]}]}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/tasks/finished/hello_world
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/tasks/finished/hello_world b/src/test/resources/org/apache/thermos/root/tasks/finished/hello_world
new file mode 100644
index 0000000..c331c53
--- /dev/null
+++ b/src/test/resources/org/apache/thermos/root/tasks/finished/hello_world
@@ -0,0 +1 @@
+{"processes": [{"cmdline": "echo hello world", "daemon": 0, "max_failures": 1, "name": "echo"}], "name": "echo", "max_failures": 1, "user": "{{thermos.user}}", "max_concurrency": 0, "resources": {"disk": 0, "ram": 8388608, "cpu": 0.01}}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/tasks/finished/ordering
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/tasks/finished/ordering b/src/test/resources/org/apache/thermos/root/tasks/finished/ordering
new file mode 100644
index 0000000..6774dc0
--- /dev/null
+++ b/src/test/resources/org/apache/thermos/root/tasks/finished/ordering
@@ -0,0 +1 @@
+{"processes": [{"cmdline": "sleep 60; echo hello brian", "daemon": 0, "max_failures": 1, "name": "echo_one"}, {"cmdline": "sleep 60; echo hello john", "daemon": 0, "max_failures": 1, "name": "echo_two"}, {"cmdline": "sleep 60; echo hello bill", "daemon": 0, "max_failures": 1, "name": "echo_three"}], "name": "echo_complex", "max_failures": 1, "user": "{{thermos.user}}", "max_concurrency": 0, "resources": {"disk": 1048576, "ram": 1048576, "cpu": 0.10000000000000001}, "constraints": [{"order": ["echo_one", "echo_two", "echo_three"]}]}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/tasks/finished/ports
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/tasks/finished/ports b/src/test/resources/org/apache/thermos/root/tasks/finished/ports
new file mode 100644
index 0000000..080ee71
--- /dev/null
+++ b/src/test/resources/org/apache/thermos/root/tasks/finished/ports
@@ -0,0 +1 @@
+{"processes": [{"cmdline": "echo {{thermos.ports[hello]}} {{thermos.ports[world]}}", "daemon": 0, "max_failures": 1, "name": "echo"}], "name": "echo", "max_failures": 1, "user": "{{thermos.user}}", "max_concurrency": 0, "resources": {"disk": 0, "ram": 8388608, "cpu": 0.01}}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/02a1c040/src/test/resources/org/apache/thermos/root/tasks/finished/sleep60
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/thermos/root/tasks/finished/sleep60 b/src/test/resources/org/apache/thermos/root/tasks/finished/sleep60
new file mode 100644
index 0000000..7c7dc47
--- /dev/null
+++ b/src/test/resources/org/apache/thermos/root/tasks/finished/sleep60
@@ -0,0 +1 @@
+{"processes": [{"cmdline": "sleep 60; echo hello world", "daemon": 0, "max_failures": 1, "name": "sleep"}], "name": "sleep", "max_failures": 1, "user": "{{thermos.user}}", "max_concurrency": 0, "resources": {"disk": 0, "ram": 8388608, "cpu": 0.01}}
\ No newline at end of file