Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

qa/rgw_snaps: move default_idle_timeout config under the client #15400

Merged
merged 1 commit into from
Jun 1, 2017
Merged

qa/rgw_snaps: move default_idle_timeout config under the client #15400

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions qa/suites/rados/basic/tasks/rgw_snaps.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ overrides:
osd_max_omap_entries_per_request: 10
tasks:
- rgw:
default_idle_timeout: 3600
client.0: null
client.0:
default_idle_timeout: 3600
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like i broke this in #15184 - default_idle_timeout was specific to fastcgi, so it's no longer being parsed and removed from config. this change should work, but it's probably better to remove the setting completely

it looks like the same issue is present in other upgrade tests:

rados/upgrade/jewel-x-singleton/8-workload/rgw-swift.yaml: default_idle_timeout: 300
upgrade/jewel-x/stress-split/7-final-workload/rgw-swift.yaml: default_idle_timeout: 300
upgrade/kraken-x/stress-split/7-final-workload/rgw-swift.yaml default_idle_timeout: 300

mind removing those too?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cbodley @liewegas I don't mind removing them altogether. I'm not sure we'd see the same issue in those tests, I think the problem we were seeing here was that the field was at the wrong level in the hierarchy.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the default_idle_timeout field was global to the rgw task (see https://github.com/ceph/ceph/pull/15184/files#diff-995b04809fcabacc3e3ecfaea903a41aL1128). there was also an idle_timeout that could be used per-client

those global fields are removed from config as they're parsed, resulting in a config whose only keys are clients. that's why it's now being mistakenly interpreted as a remote in this test failure. i'd expect the same thing to happen in the upgrade tests

moving the line under client.0 does work to pass the test - it just won't be used anywhere

- thrash_pool_snaps:
pools:
- .rgw.buckets
Expand Down