From 02242ea48e8a2e53da72e1ee593a1ce623c4114d Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Thu, 1 Jun 2017 14:01:30 -0700 Subject: [PATCH] Removed all 'default_idle_timeout' due to chnage in rwg task https://github.com/ceph/ceph/commit/8c74c8a639cd3dead52e1942b36f6eb3f1ceab2c#diff-995b04809fcabacc3e3ecfaea903a41aL539 Signed-off-by: Yuri Weinstein --- qa/machine_types/vps.yaml | 2 -- qa/suites/rados/basic/tasks/rgw_snaps.yaml | 1 - .../rados/upgrade/jewel-x-singleton/8-workload/rgw-swift.yaml | 1 - .../jewel-x/stress-split/7-final-workload/rgw-swift.yaml | 1 - .../kraken-x/stress-split/7-final-workload/rgw-swift.yaml | 1 - 5 files changed, 6 deletions(-) diff --git a/qa/machine_types/vps.yaml b/qa/machine_types/vps.yaml index bffa0985da8d2..64a3da47d4e3c 100644 --- a/qa/machine_types/vps.yaml +++ b/qa/machine_types/vps.yaml @@ -6,8 +6,6 @@ overrides: # this line to address issue #1017 mon lease: 15 mon lease ack timeout: 25 - rgw: - default_idle_timeout: 1200 s3tests: idle_timeout: 1200 ceph-fuse: diff --git a/qa/suites/rados/basic/tasks/rgw_snaps.yaml b/qa/suites/rados/basic/tasks/rgw_snaps.yaml index cab3e814ef701..2108317a9719b 100644 --- a/qa/suites/rados/basic/tasks/rgw_snaps.yaml +++ b/qa/suites/rados/basic/tasks/rgw_snaps.yaml @@ -9,7 +9,6 @@ overrides: tasks: - rgw: client.0: - default_idle_timeout: 3600 - thrash_pool_snaps: pools: - .rgw.buckets diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rgw-swift.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rgw-swift.yaml index ba004ceac637d..e41f47ad0db5d 100644 --- a/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rgw-swift.yaml +++ b/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rgw-swift.yaml @@ -4,7 +4,6 @@ meta: tasks: - rgw: client.0: - default_idle_timeout: 300 - print: "**** done rgw 9-workload" - swift: client.0: diff --git a/qa/suites/upgrade/jewel-x/stress-split/7-final-workload/rgw-swift.yaml b/qa/suites/upgrade/jewel-x/stress-split/7-final-workload/rgw-swift.yaml index a3bf03b1f448a..76e5d6fc23158 100644 --- a/qa/suites/upgrade/jewel-x/stress-split/7-final-workload/rgw-swift.yaml +++ b/qa/suites/upgrade/jewel-x/stress-split/7-final-workload/rgw-swift.yaml @@ -4,7 +4,6 @@ meta: tasks: - rgw: client.0: - default_idle_timeout: 300 - print: "**** done rgw 9-workload" - swift: client.0: diff --git a/qa/suites/upgrade/kraken-x/stress-split/7-final-workload/rgw-swift.yaml b/qa/suites/upgrade/kraken-x/stress-split/7-final-workload/rgw-swift.yaml index a3bf03b1f448a..76e5d6fc23158 100644 --- a/qa/suites/upgrade/kraken-x/stress-split/7-final-workload/rgw-swift.yaml +++ b/qa/suites/upgrade/kraken-x/stress-split/7-final-workload/rgw-swift.yaml @@ -4,7 +4,6 @@ meta: tasks: - rgw: client.0: - default_idle_timeout: 300 - print: "**** done rgw 9-workload" - swift: client.0: -- 2.39.5