common: Fix 44373 and make a couple cleanups in ceph::timer #33771
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
liewegas
approved these changes
Mar 6, 2020
tchaikov
changed the title
tchaikov
previously requested changes
Mar 6, 2020
adamemerson
force-pushed
the
wip-44373
branch
2 times, most recently
from
0cfa489
to
2289aa4
Compare
|
@tchaikov The conflict should be fixed. |
|
I think this is causing rados/perf runs to fail with /a/sage-2020-03-08_17:10:32-rados-wip-sage4-testing-2020-03-08-0938-distro-basic-smithi/4838021 |
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Stuffing things into 'detail' and using them just makes backtraces and valgrind illegible. Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Take advantage of a couple things in Boost.Intrusive that make the code less obfuscated. Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
std::condition_variable::wait_until takes a const reference to a time_point. It may access this reference after relinquishing the mutex, creating a potential use-after-free error if the first event is shut down. So, just copy the time onto the stack, so we have a reference that won't disappear. https://tracker.ceph.com/issues/44373 Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
|
turns out the perf failure was a different PR, retesting |
liewegas
added a commit
that referenced
this pull request
Mar 11, 2020
* refs/pull/33885/head: Merge pull request #33848 from mchangir/octopus-tests-remove-suprious-whitespace Merge PR #33746 into octopus Merge PR #33830 into octopus Merge PR #33732 into octopus Merge PR #33620 into octopus Merge pull request #33876 from tchaikov/octopus-cephadm-mypy cephadm: add "assert foo is not None" for mypy check Merge pull request #33067 from tspmelo/wip-rbd-delete-with-snapshot cephadm: add grafana adopt Merge PR #33771 into octopus Merge PR #33850 into octopus Merge PR #33853 into octopus Merge PR #33857 into octopus Merge PR #32990 into octopus Merge PR #33713 into octopus Merge PR #33838 into octopus qa/tasks/cephadm: no default mon|mgr|crash service specs qa/suites/rados/cephadm/upgrade: upgrade start point that supports the no-spec option Merge PR #33832 into octopus cephadm: bootstrap: wait for mgr to restart after enabling a module mgr: add 'mgr_status' tell command Merge pull request #33839 from rhcs-dashboard/44538-fix-rgw-grafana-get-put-latencies Merge pull request #33743 from votdev/issue_43869_fix_qa_test cephadm: create initial mon and mgr service specs too cephadm: no need to pregenerate a crash key for the bootstrap host mgr/cephadm: do not complain when we don't have enough hosts mgr/cephadm: remove orphan daemons mgr/cephadm: report size=0 for fabricated ServiceDescription mgr/cephadm: safety check to prevent removing all mon|mgr daemons mgr/cephadm: prevent scaling mon|mgr below count=1 mgr/cephadm: do not remove daemons from remove_service Merge pull request #33805 from tchaikov/wip-44500 spec: Podman (temporarily) requires apparmor-abstractions on suse mgr/cephadm: Make sure we don't co-locate the same daemon monitoring: fix RGW grafana chart 'Average GET/PUT Latencies' tests: remove spurious whitespace mgr/cephadm: fix service list filtering Merge PR #33825 into octopus Merge PR #33811 into octopus Revert "Merge pull request #33673 from cbodley/wip-denc-enum" mgr/cephadm: fix upgrade order Merge PR #33801 into octopus Merge PR #33822 into octopus cephadm: bootstrap: tolerate error return from -h Merge PR #33809 into octopus Merge PR #32678 into octopus cephadm: use `sh` instead of `bash` during enter ceph.in: only shut down rados on clean exit common/ceph_timer: Pass reference to waited time on stack common/ceph_timer: Add test common/ceph_timer: Use unique_function, allowing noncopyable events common/ceph_timer: Couple cleanups common/ceph_timer: Fix namespaces common/ceph_timer: Add missing includes common/ceph_timer.h: Don't indent contents of a namespace mgr/dashboard: Crush rule modal mgr/dashboard: Preserve rule selection on pool type change mgr/dashboard: Crush rule is only send during replicated pool creation mgr/dashboard: Explicit returns in pool form mgr/dashboard: Removes fork join in pool form mgr/dashboard: Hide ECP actions during ec pool edit mgr/dashboard: Pool form erasure/replicated boolean mgr/dashboard: Change pool info API endpoint mgr/dashboard: Moves ECP info endpoint to UI-API mgr/cephadm: add _remove_osds_bg back to main loop mgr/cephadm/osd: update removal report immediately qa/tasks/ceph_manager: use StringIO for capturing COT output qa/standalone/scrub/osd-scrub-repair: force osdmap prop to osds qa/standalone/scrub/osd-scrub-test: wait longer for update qa/tasks/ceph_manager: capture stderr for COT qa/suites/rados/ceph: drop opensuse for now mon/MonClient: send logs to mon on separate schedule than pings mgr/dashboard: Fix missing ImageSpec usage mgr/dashboard: Allow removing RBD with snapshots mgr/dashboard: Refactor and cleanup tasks.mgr.dashboard.test_user mgr/dashboard: support multiple DriveGroups when creating OSDs mon/MonClient: send logs to mon even if we have no keelalive2 cephadm: flag dashboard user to change password Reviewed-by: Sebastian Wagner <swagner@suse.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes https://tracker.ceph.com/issues/44373
I figured I should add a test, too, so I had a controlled place to run valgrind and since it used promises in the lambdas I switched event to use unique_function. And made a couple other cleanups while I was at it.
Checklist