Skip to content

qa/tasks/mgr: set mgr module option with --force#32588

Merged
tchaikov merged 1 commit intoceph:masterfrom
tchaikov:wip-qa-mgr-setup-with-force
Jan 10, 2020
Merged

qa/tasks/mgr: set mgr module option with --force#32588
tchaikov merged 1 commit intoceph:masterfrom
tchaikov:wip-qa-mgr-setup-with-force

Conversation

@tchaikov
Copy link
Contributor

if mgr is not active, monitor will refuse to set any option consumed by
mgr modules.

the reason the tests pass somtimes is that, we have a racing here:

  1. stop all mgr daemons
  2. MgrMonitor gets updated and updates its mgr_module_options
    accordingly.
  3. in TestDashboard.setUp(), we reset the port number for dashboard
    using "ceph config set mgr mgr/dashboard/y/ssl_server_port 7789"
  4. restart all mgr daemons

but the 2nd step and 3rd step could race with each other, if the 2nd
step happens after 3rd step, the test passes. otherwise it fails.

in this change, "--force" is passed to the "ceph config set" command,
so ConfigMonitor can bypass the sanity test for the option, and just
set this option.

Signed-off-by: Kefu Chai kchai@redhat.com

Checklist

  • References tracker ticket
  • Updates documentation if necessary
  • Includes tests for new functionality or reproducer for bug

Show available Jenkins commands
  • jenkins retest this please
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard backend
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox

if mgr is not active, monitor will refuse to set any option consumed by
mgr modules.

the reason the tests pass somtimes is that, we have a racing here:

1. stop all mgr daemons
2. MgrMonitor gets updated and updates its mgr_module_options
accordingly.
3. in TestDashboard.setUp(), we reset the port number for dashboard
using "ceph config set mgr mgr/dashboard/y/ssl_server_port 7789"
4. restart all mgr daemons

but the 2nd step and 3rd step could race with each other, if the 2nd
step happens after 3rd step, the test passes. otherwise it fails.

in this change, "--force" is passed to the "ceph config set" command,
so ConfigMonitor can bypass the sanity test for the option, and just
set this option.

Signed-off-by: Kefu Chai <kchai@redhat.com>
@tchaikov
Copy link
Contributor Author

@tchaikov
Copy link
Contributor Author

jenkins test make check

1 similar comment
@tchaikov
Copy link
Contributor Author

jenkins test make check

@tchaikov tchaikov requested a review from neha-ojha January 10, 2020 09:54
Copy link
Member

@callithea callithea left a comment

Choose a reason for hiding this comment

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

lgtm

@tchaikov
Copy link
Contributor Author

@tchaikov
Copy link
Contributor Author

@tchaikov tchaikov merged commit 62a79c0 into ceph:master Jan 10, 2020
@tchaikov tchaikov deleted the wip-qa-mgr-setup-with-force branch January 10, 2020 14:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants