Skip to content

mgr/DaemonServer: keep daemon in service map when it has no tasks#36091

Merged
tchaikov merged 2 commits intoceph:masterfrom
tchaikov:wip-46495
Jul 16, 2020
Merged

mgr/DaemonServer: keep daemon in service map when it has no tasks#36091
tchaikov merged 2 commits intoceph:masterfrom
tchaikov:wip-46495

Conversation

@tchaikov
Copy link
Contributor

@tchaikov tchaikov commented Jul 14, 2020 •
edited by smithfarm
Loading

this change partially reverts 5a7d063

Fixes: https://tracker.ceph.com/issues/46495

@tchaikov tchaikov requested review from batrick, bk201 and vshankar July 14, 2020 09:53
@tchaikov tchaikov requested a review from alfonsomthd July 14, 2020 09:57
@smithfarm smithfarm mentioned this pull request Jul 14, 2020
Merged
@sebastian-philipp sebastian-philipp mentioned this pull request Jul 14, 2020
Merged
5 tasks
@alfonsomthd alfonsomthd requested a review from epuertat July 14, 2020 14:49
@batrick batrick added the cephfs Ceph File System label Jul 14, 2020
@bk201
Copy link
Contributor

bk201 commented Jul 15, 2020

jenkins test dashboard

@bk201 bk201 changed the title mgr/DaemonServer: keep daemon in service map when it has no tasks mgr/DaemonServer: keep daemon in service map when it has no tasks 1 Jul 15, 2020
@bk201
Copy link
Contributor

bk201 commented Jul 15, 2020

jenkins test dashboard

@bk201 bk201 changed the title mgr/DaemonServer: keep daemon in service map when it has no tasks 1 mgr/DaemonServer: keep daemon in service map when it has no tasks Jul 15, 2020
@bk201
Copy link
Contributor

bk201 commented Jul 15, 2020

The rgw is back in the service_map, thanks for the fix!

vshankar
vshankar reviewed Jul 15, 2020
View reviewed changes
tchaikov added 2 commits July 15, 2020 12:36
@tchaikov
mgr/DaemonServer: pass task_status instead of a message
87c86e9 
be explicit that the caller is only interested in the task_status

Signed-off-by: Kefu Chai <kchai@redhat.com>
@tchaikov
mgr/DaemonServer: keep daemon in service map when it has no tasks
bebc2ae 
we should not remove a daemon from service map even if it has no task
running, as it is not an evidence that the service is removed from the
cluster.

this change partially reverts 5a7d063

Fixes: https://tracker.ceph.com/issues/46495
Signed-off-by: Kefu Chai <kchai@redhat.com>
@vshankar
Copy link
Contributor

vshankar commented Jul 15, 2020

Thanks @tchaikov

@vshankar
Copy link
Contributor

vshankar commented Jul 15, 2020

This might need a small fix to cephfs scrub tests -- I'll push that out

@vshankar
Copy link
Contributor

vshankar commented Jul 15, 2020

This might need a small fix to cephfs scrub tests -- I'll push that out

this is already handled in scrub tests.

@vshankar
Copy link
Contributor

vshankar commented Jul 15, 2020

I'll run this through fs suite (scrub tests)

This was referenced Jul 15, 2020
Merged
Merged
This was referenced Jul 15, 2020
Merged
Merged
Merged
Merged
Merged
Closed
Merged
@vshankar
Copy link
Contributor

vshankar commented Jul 15, 2020

https://pulpito.ceph.com/vshankar-2020-07-15_12:05:32-fs-wip-vshankar-testing-2020-07-15-052000-distro-basic-smithi/

passes fs suite (scrub filter)

@batrick batrick added the rgw label Jul 15, 2020
This was referenced Jul 15, 2020
Merged
Merged
Merged
Merged
@guits
Copy link
Contributor

guits commented Jul 15, 2020

@tchaikov @vshankar this is breaking all ceph-ansible CI jobs. Is there something else needed to get this PR merged? Thanks!

@tchaikov
Copy link
Contributor Author

tchaikov commented Jul 15, 2020 •
edited
Loading

@tchaikov @vshankar this is breaking all ceph-ansible CI jobs. Is there something else needed to get this PR merged? Thanks!

@guits i need to

@tchaikov
Copy link
Contributor Author

tchaikov commented Jul 16, 2020

@tchaikov
Copy link
Contributor Author

tchaikov commented Jul 16, 2020

@batrick i am merging this PR without waiting for your test results as it should help to address the breakages in our tests. if it breaks cephfs tests. please ping me. i will get it fixed ASAP.

@tchaikov tchaikov merged commit 9e21f4d into ceph:master Jul 16, 2020
@tchaikov tchaikov deleted the wip-46495 branch July 16, 2020 09:17
@batrick
Copy link
Member

batrick commented Jul 16, 2020

@batrick i am merging this PR without waiting for your test results as it should help to address the breakages in our tests. if it breaks cephfs tests. please ping me. i will get it fixed ASAP.

No worries, thanks.

@smithfarm smithfarm mentioned this pull request Jul 18, 2020
Merged
8 tasks
@dzafman dzafman mentioned this pull request Jul 19, 2020
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vshankar vshankar vshankar approved these changes

@batrick batrick Awaiting requested review from batrick

@bk201 bk201 Awaiting requested review from bk201

@alfonsomthd alfonsomthd Awaiting requested review from alfonsomthd

@epuertat epuertat Awaiting requested review from epuertat

Assignees

@vshankar vshankar

Labels

bug-fix cephfs Ceph File System dashboard mgr needs-qa rgw wip-pdonnell-testing

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@tchaikov @bk201 @vshankar @guits @batrick