Skip to content

mds: send scrub status to ceph-mgr only when scrub is running#34861

Merged
batrick merged 3 commits intoceph:masterfrom
vshankar:wip-optional-task-status
Jul 9, 2020
Merged

mds: send scrub status to ceph-mgr only when scrub is running#34861
batrick merged 3 commits intoceph:masterfrom
vshankar:wip-optional-task-status

Conversation

@vshankar
Copy link
Contributor

@vshankar vshankar commented Apr 30, 2020 •
edited by smithfarm
Loading

@vshankar vshankar added the cephfs Ceph File System label Apr 30, 2020
@vshankar vshankar force-pushed the wip-optional-task-status branch from e8cf637 to 37a46f3 Compare May 4, 2020 08:59
@vshankar vshankar changed the title [WIP] mds: send scrub status to ceph-mgr only when scrub is running mds: send scrub status to ceph-mgr only when scrub is running May 4, 2020
@vshankar vshankar requested a review from a team May 5, 2020 04:23
batrick
batrick requested changes Jun 29, 2020
View reviewed changes
Copy link
Member

@batrick batrick left a comment

Choose a reason for hiding this comment

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

nits otherwise lgtm

@vshankar vshankar force-pushed the wip-optional-task-status branch from 37a46f3 to 0e3e063 Compare June 30, 2020 10:42
@batrick
Copy link
Member

batrick commented Jul 4, 2020

jenkins retest this

@batrick
Copy link
Member

batrick commented Jul 6, 2020

retest this please

@batrick batrick changed the base branch from master to octopus July 6, 2020 23:56
@batrick batrick changed the base branch from octopus to master July 6, 2020 23:56
batrick
batrick requested changes Jul 7, 2020
View reviewed changes
Copy link
Member

@batrick batrick left a comment

Choose a reason for hiding this comment

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

Let's get this green and then I'll merge. It passes CephFS QA.

vshankar added 3 commits July 8, 2020 23:49
@vshankar
mds: send scrub status to ceph-mgr only when scrub is running
5a7d063 
Signed-off-by: Venky Shankar <vshankar@redhat.com>
@vshankar
mgr: set task_dirty_status on reconnect
c92ba33 
... so that upon reconnect the manager client updates manager
with whatever is available in ->task_status field.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
@vshankar
test: adjust scrub control tests for optional scrub status
ff63624 
Fixes: http://tracker.ceph.com/issues/45349
Signed-off-by: Venky Shankar <vshankar@redhat.com>
@vshankar vshankar force-pushed the wip-optional-task-status branch from 0e3e063 to ff63624 Compare July 9, 2020 03:51
@vshankar
Copy link
Contributor Author

vshankar commented Jul 9, 2020

fixed and updated

@batrick batrick merged commit 957bcb4 into ceph:master Jul 9, 2020
@smithfarm smithfarm mentioned this pull request Jul 11, 2020
Merged
5 tasks
@votdev
Copy link
Member

votdev commented Jul 14, 2020 •
edited
Loading

Why has this PR been merged, although the Dashboard API tests are failing? We now have a regression: https://tracker.ceph.com/issues/46495
Please contact the Dashboard team to clarify such issues the next time before merging.

@smithfarm
Copy link
Contributor

smithfarm commented Jul 14, 2020 •
edited
Loading

This PR introduced a regression - https://tracker.ceph.com/issues/46495 - which is being fixed by #36091

(Since there is no tracker associated with this PR, I'm guessing that it's not a candidate for backport, but just in case...)

@smithfarm smithfarm added the mgr label Jul 14, 2020
@batrick
Copy link
Member

batrick commented Jul 14, 2020

This PR introduced a regression - https://tracker.ceph.com/issues/46495 - which is being fixed by #36091

(Since there is no tracker associated with this PR, I'm guessing that it's not a candidate for backport, but just in case...)

https://tracker.ceph.com/issues/45349 ?

@smithfarm
Copy link
Contributor

smithfarm commented Jul 14, 2020 •
edited
Loading

https://tracker.ceph.com/issues/45349 ?

Yeah - added that to the PR description (and updated the backport trackers/PR) in the meantime.

@vshankar
Copy link
Contributor Author

vshankar commented Jul 15, 2020

Why has this PR been merged, although the Dashboard API tests are failing? We now have a regression: https://tracker.ceph.com/issues/46495
Please contact the Dashboard team to clarify such issues the next time before merging.

I think there were other failures which probably masked this regression...

@tchaikov
Copy link
Contributor

tchaikov commented Jul 15, 2020

Why has this PR been merged, although the Dashboard API tests are failing? We now have a regression: https://tracker.ceph.com/issues/46495
Please contact the Dashboard team to clarify such issues the next time before merging.

I think there were other failures which probably masked this regression...

please see https://jenkins.ceph.com/job/ceph-dashboard-pr-backend/3522/

which has the first occurrence of https://tracker.ceph.com/issues/46495

Python Unit-test Failure

Failures: 1

test_get_export (tasks.mgr.dashboard.test_ganesha.GaneshaTest)
2020-07-14 11:45:43,994.994 INFO:__main__:----------------------------------------------------------------------
2020-07-14 11:45:43,994.994 INFO:__main__:Traceback (most recent call last):
2020-07-14 11:45:43,994.994 INFO:__main__:  File "/home/jenkins-build/build/workspace/ceph-dashboard-pr-backend/qa/tasks/mgr/dashboard/test_ganesha.py", line 148, in test_get_export
2020-07-14 11:45:43,994.994 INFO:__main__:    self.assertDictEqual(export2, data2)
2020-07-14 11:45:43,994.994 INFO:__main__:AssertionError: {'status': '404 Not Found', 'detail': 'Noth[76 chars]85d'} != {'detail': "Cannot create this export. FSAL[181 chars]2'}}}
2020-07-14 11:45:43,994.994 INFO:__main__:- {'detail': 'Nothing matches the given URI',
2020-07-14 11:45:43,994.994 INFO:__main__:-  'request_id': '4b8fbb53-e593-4ae9-82ca-cbec8c2dd85d',
2020-07-14 11:45:43,995.995 INFO:__main__:-  'status': '404 Not Found'}
2020-07-14 11:45:43,995.995 INFO:__main__:+ {'component': 'nfs',
2020-07-14 11:45:43,995.995 INFO:__main__:+  'detail': "Cannot create this export. FSAL 'RGW' cannot be managed by the "
2020-07-14 11:45:43,995.995 INFO:__main__:+            'dashboard.',
2020-07-14 11:45:43,995.995 INFO:__main__:+  'status': 400,
2020-07-14 11:45:43,995.995 INFO:__main__:+  'task': {'metadata': {'cluster_id': 'cluster2',
2020-07-14 11:45:43,995.995 INFO:__main__:+                        'fsal': 'RGW',
2020-07-14 11:45:43,995.995 INFO:__main__:+                        'path': 'mybucket'},
2020-07-14 11:45:43,995.995 INFO:__main__:+           'name': 'nfs/create'}}
2020-07-14 11:45:43,995.995 INFO:__main__:
2020-07-14 11:45:43,995.995 INFO:__main__:----------------------------------------------------------------------
2020-07-14 11:45:43,996.996 INFO:__main__:Ran 63 tests in 670.669s
2020-07-14 11:45:43,996.996 INFO:__main__:
2020-07-14 11:45:43,996.996 INFO:__main__:

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

Reviewers

@batrick batrick batrick approved these changes

Assignees

No one assigned

Labels

cephfs Ceph File System mgr needs-qa wip-pdonnell-testing

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@vshankar @batrick @votdev @smithfarm @tchaikov @gregsfortytwo