From: Loic Dachary <loic-201408@dachary.org>
Date: Sat, 30 Aug 2014 08:03:30 +0000 (+0200)
Subject: erasure-code: add to suites/upgrade/*-x final workloads
X-Git-Tag: v0.94.10~27^2^2~329^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a019c84f47e08ebacef447cd5ec0760539cf0faf;p=ceph.git

erasure-code: add to suites/upgrade/*-x final workloads

And replace the ec-readwrite.yaml custom workloads with links to the
workloads found in the erasure-code directory.

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
---

diff --git a/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/ec-rados-default.yaml b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/ec-rados-default.yaml
new file mode 120000
index 000000000000..a8a0ae69405a
--- /dev/null
+++ b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/ec-rados-default.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-default.yaml
\ No newline at end of file
diff --git a/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/ec-rados-plugin=isa-k=2-m=1.yaml b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/ec-rados-plugin=isa-k=2-m=1.yaml
new file mode 120000
index 000000000000..79888dd1afb1
--- /dev/null
+++ b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/ec-rados-plugin=isa-k=2-m=1.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-plugin=isa-k=2-m=1.yaml
\ No newline at end of file
diff --git a/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
new file mode 120000
index 000000000000..4b9d9a44a245
--- /dev/null
+++ b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-plugin=jerasure-k=3-m=1.yaml
\ No newline at end of file
diff --git a/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/ec-rados-plugin=lrc-k=4-m=2-l=3.yaml b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/ec-rados-plugin=lrc-k=4-m=2-l=3.yaml
new file mode 120000
index 000000000000..8bd9bfbc9c3f
--- /dev/null
+++ b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/ec-rados-plugin=lrc-k=4-m=2-l=3.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-plugin=lrc-k=4-m=2-l=3.yaml
\ No newline at end of file
diff --git a/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/ec-rados-default.yaml b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/ec-rados-default.yaml
new file mode 120000
index 000000000000..a8a0ae69405a
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/ec-rados-default.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-default.yaml
\ No newline at end of file
diff --git a/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/ec-rados-plugin=isa-k=2-m=1.yaml b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/ec-rados-plugin=isa-k=2-m=1.yaml
new file mode 120000
index 000000000000..79888dd1afb1
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/ec-rados-plugin=isa-k=2-m=1.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-plugin=isa-k=2-m=1.yaml
\ No newline at end of file
diff --git a/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
new file mode 120000
index 000000000000..4b9d9a44a245
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-plugin=jerasure-k=3-m=1.yaml
\ No newline at end of file
diff --git a/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/ec-rados-plugin=lrc-k=4-m=2-l=3.yaml b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/ec-rados-plugin=lrc-k=4-m=2-l=3.yaml
new file mode 120000
index 000000000000..8bd9bfbc9c3f
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/ec-rados-plugin=lrc-k=4-m=2-l=3.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-plugin=lrc-k=4-m=2-l=3.yaml
\ No newline at end of file
diff --git a/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/ec-readwrite.yaml b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/ec-readwrite.yaml
deleted file mode 100644
index 80b9140e707d..000000000000
--- a/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/ec-readwrite.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 500
-    ec_pool: true
-    op_weights:
-      read: 45
-      write: 0
-      append: 45
-      delete: 10
diff --git a/suites/upgrade/dumpling-x/parallel/5-final-workload/ec-rados-default.yaml b/suites/upgrade/dumpling-x/parallel/5-final-workload/ec-rados-default.yaml
new file mode 120000
index 000000000000..a8a0ae69405a
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/5-final-workload/ec-rados-default.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-default.yaml
\ No newline at end of file
diff --git a/suites/upgrade/dumpling-x/parallel/5-final-workload/ec-rados-plugin=isa-k=2-m=1.yaml b/suites/upgrade/dumpling-x/parallel/5-final-workload/ec-rados-plugin=isa-k=2-m=1.yaml
new file mode 120000
index 000000000000..79888dd1afb1
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/5-final-workload/ec-rados-plugin=isa-k=2-m=1.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-plugin=isa-k=2-m=1.yaml
\ No newline at end of file
diff --git a/suites/upgrade/dumpling-x/parallel/5-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml b/suites/upgrade/dumpling-x/parallel/5-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
new file mode 120000
index 000000000000..4b9d9a44a245
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/5-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-plugin=jerasure-k=3-m=1.yaml
\ No newline at end of file
diff --git a/suites/upgrade/dumpling-x/parallel/5-final-workload/ec-rados-plugin=lrc-k=4-m=2-l=3.yaml b/suites/upgrade/dumpling-x/parallel/5-final-workload/ec-rados-plugin=lrc-k=4-m=2-l=3.yaml
new file mode 120000
index 000000000000..8bd9bfbc9c3f
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/5-final-workload/ec-rados-plugin=lrc-k=4-m=2-l=3.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-plugin=lrc-k=4-m=2-l=3.yaml
\ No newline at end of file
diff --git a/suites/upgrade/dumpling-x/stress-split/9-workload/ec-rados-default.yaml b/suites/upgrade/dumpling-x/stress-split/9-workload/ec-rados-default.yaml
new file mode 120000
index 000000000000..a8a0ae69405a
--- /dev/null
+++ b/suites/upgrade/dumpling-x/stress-split/9-workload/ec-rados-default.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-default.yaml
\ No newline at end of file
diff --git a/suites/upgrade/dumpling-x/stress-split/9-workload/ec-rados-plugin=isa-k=2-m=1.yaml b/suites/upgrade/dumpling-x/stress-split/9-workload/ec-rados-plugin=isa-k=2-m=1.yaml
new file mode 120000
index 000000000000..79888dd1afb1
--- /dev/null
+++ b/suites/upgrade/dumpling-x/stress-split/9-workload/ec-rados-plugin=isa-k=2-m=1.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-plugin=isa-k=2-m=1.yaml
\ No newline at end of file
diff --git a/suites/upgrade/dumpling-x/stress-split/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml b/suites/upgrade/dumpling-x/stress-split/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
new file mode 120000
index 000000000000..4b9d9a44a245
--- /dev/null
+++ b/suites/upgrade/dumpling-x/stress-split/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-plugin=jerasure-k=3-m=1.yaml
\ No newline at end of file
diff --git a/suites/upgrade/dumpling-x/stress-split/9-workload/ec-rados-plugin=lrc-k=4-m=2-l=3.yaml b/suites/upgrade/dumpling-x/stress-split/9-workload/ec-rados-plugin=lrc-k=4-m=2-l=3.yaml
new file mode 120000
index 000000000000..8bd9bfbc9c3f
--- /dev/null
+++ b/suites/upgrade/dumpling-x/stress-split/9-workload/ec-rados-plugin=lrc-k=4-m=2-l=3.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-plugin=lrc-k=4-m=2-l=3.yaml
\ No newline at end of file
diff --git a/suites/upgrade/firefly-x/parallel/2-workload/ec-rados-default.yaml b/suites/upgrade/firefly-x/parallel/2-workload/ec-rados-default.yaml
new file mode 120000
index 000000000000..a8a0ae69405a
--- /dev/null
+++ b/suites/upgrade/firefly-x/parallel/2-workload/ec-rados-default.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-default.yaml
\ No newline at end of file
diff --git a/suites/upgrade/firefly-x/parallel/5-final-workload/ec-rados-default.yaml b/suites/upgrade/firefly-x/parallel/5-final-workload/ec-rados-default.yaml
new file mode 120000
index 000000000000..a8a0ae69405a
--- /dev/null
+++ b/suites/upgrade/firefly-x/parallel/5-final-workload/ec-rados-default.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-default.yaml
\ No newline at end of file
diff --git a/suites/upgrade/firefly-x/parallel/5-final-workload/ec-rados-plugin=isa-k=2-m=1.yaml b/suites/upgrade/firefly-x/parallel/5-final-workload/ec-rados-plugin=isa-k=2-m=1.yaml
new file mode 120000
index 000000000000..79888dd1afb1
--- /dev/null
+++ b/suites/upgrade/firefly-x/parallel/5-final-workload/ec-rados-plugin=isa-k=2-m=1.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-plugin=isa-k=2-m=1.yaml
\ No newline at end of file
diff --git a/suites/upgrade/firefly-x/parallel/5-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml b/suites/upgrade/firefly-x/parallel/5-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
new file mode 120000
index 000000000000..4b9d9a44a245
--- /dev/null
+++ b/suites/upgrade/firefly-x/parallel/5-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-plugin=jerasure-k=3-m=1.yaml
\ No newline at end of file
diff --git a/suites/upgrade/firefly-x/parallel/5-final-workload/ec-rados-plugin=lrc-k=4-m=2-l=3.yaml b/suites/upgrade/firefly-x/parallel/5-final-workload/ec-rados-plugin=lrc-k=4-m=2-l=3.yaml
new file mode 120000
index 000000000000..8bd9bfbc9c3f
--- /dev/null
+++ b/suites/upgrade/firefly-x/parallel/5-final-workload/ec-rados-plugin=lrc-k=4-m=2-l=3.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-plugin=lrc-k=4-m=2-l=3.yaml
\ No newline at end of file
diff --git a/suites/upgrade/firefly-x/stress-split/5-workload/ec-rados-default.yaml b/suites/upgrade/firefly-x/stress-split/5-workload/ec-rados-default.yaml
new file mode 120000
index 000000000000..a8a0ae69405a
--- /dev/null
+++ b/suites/upgrade/firefly-x/stress-split/5-workload/ec-rados-default.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-default.yaml
\ No newline at end of file
diff --git a/suites/upgrade/firefly-x/stress-split/5-workload/ec-readwrite.yaml b/suites/upgrade/firefly-x/stress-split/5-workload/ec-readwrite.yaml
deleted file mode 100644
index 80b9140e707d..000000000000
--- a/suites/upgrade/firefly-x/stress-split/5-workload/ec-readwrite.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 500
-    ec_pool: true
-    op_weights:
-      read: 45
-      write: 0
-      append: 45
-      delete: 10
diff --git a/suites/upgrade/firefly-x/stress-split/9-workload/ec-rados-default.yaml b/suites/upgrade/firefly-x/stress-split/9-workload/ec-rados-default.yaml
new file mode 120000
index 000000000000..a8a0ae69405a
--- /dev/null
+++ b/suites/upgrade/firefly-x/stress-split/9-workload/ec-rados-default.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-default.yaml
\ No newline at end of file
diff --git a/suites/upgrade/firefly-x/stress-split/9-workload/ec-rados-plugin=isa-k=2-m=1.yaml b/suites/upgrade/firefly-x/stress-split/9-workload/ec-rados-plugin=isa-k=2-m=1.yaml
new file mode 120000
index 000000000000..79888dd1afb1
--- /dev/null
+++ b/suites/upgrade/firefly-x/stress-split/9-workload/ec-rados-plugin=isa-k=2-m=1.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-plugin=isa-k=2-m=1.yaml
\ No newline at end of file
diff --git a/suites/upgrade/firefly-x/stress-split/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml b/suites/upgrade/firefly-x/stress-split/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
new file mode 120000
index 000000000000..4b9d9a44a245
--- /dev/null
+++ b/suites/upgrade/firefly-x/stress-split/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-plugin=jerasure-k=3-m=1.yaml
\ No newline at end of file
diff --git a/suites/upgrade/firefly-x/stress-split/9-workload/ec-rados-plugin=lrc-k=4-m=2-l=3.yaml b/suites/upgrade/firefly-x/stress-split/9-workload/ec-rados-plugin=lrc-k=4-m=2-l=3.yaml
new file mode 120000
index 000000000000..8bd9bfbc9c3f
--- /dev/null
+++ b/suites/upgrade/firefly-x/stress-split/9-workload/ec-rados-plugin=lrc-k=4-m=2-l=3.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-plugin=lrc-k=4-m=2-l=3.yaml
\ No newline at end of file