mds: split up mdstypes #46295

dparmar18 · 2022-05-17T06:20:07Z

mdstypes.h contains both MDS-exclusive and client-shared structs.
This PR splits it up into "mdstypes.h" and "sharedtypes.h".

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

Signed-off-by: dparmar18 dparmar@redhat.com

Contribution Guidelines

To sign and title your commits, please refer to Submitting Patches to Ceph.
If you are submitting a fix for a stable branch (e.g. "pacific"), please refer to Submitting Patches to Ceph - Backports for the proper workflow.

Checklist

Tracker (select at least one)
- References tracker ticket
- Very recent bug; references commit where it was introduced
- New feature (ticket optional)
- Doc update (no ticket needed)
- Code cleanup (no ticket needed)
Component impact
- Affects Dashboard, opened tracker ticket
- Affects Orchestrator, opened tracker ticket
- No impact that needs to be tracked
Documentation (select at least one)
- Updates relevant documentation
- No doc update is appropriate
Tests (select at least one)
- Includes unit test(s)
- Includes integration test(s)
- Includes bug reproducer
- No tests

Show available Jenkins commands

jenkins retest this please
jenkins test classic perf
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 cephadm
jenkins test api
jenkins test docs
jenkins render docs
jenkins test ceph-volume all
jenkins test ceph-volume tox
jenkins test windows

src/include/cephfs/sharedtypes.h

src/mds/mdstypes.h

rishabh-d-dave · 2022-05-20T04:50:19Z

@dparmar18 Signed-off-by line is missing in latest commits.

dparmar18 · 2022-05-24T12:53:11Z

Thanks, it's fixed.

src/mds/mdstypes.h

rishabh-d-dave · 2022-05-24T13:49:45Z

@dparmar18 I gave it a quick look, looks okay.

rishabh-d-dave · 2022-05-24T13:50:32Z

~~@dparmar18 BTW, rgw label is set on this PR. Is it by mistake?~~

EDIT: You just removed it. XD

dparmar18 · 2022-05-24T13:55:19Z

@batrick, Done with all the requested changes. apologies for the mixup related to whitespace modifications. IDE used to remove all the trailing white spaces and I just discovered that setting a few minutes back.

neesingh-rh

minor nit: newline missing at the end of the /cephfs/types.h.Otherwise, LGTM

dparmar18 · 2022-05-25T07:36:07Z

Yeah added now

nmshelke

LGTM

vshankar

@dparmar18 - https://jenkins.ceph.com/job/ceph-dev-new-build/ARCH=x86_64,AVAILABLE_ARCH=x86_64,AVAILABLE_DIST=centos8,DIST=centos8,MACHINE_SIZE=gigantic/63017//consoleFull

error: Installed (but unpackaged) file(s) found:
   /usr/include/cephfs/types.h


RPM build errors:
    Installed (but unpackaged) file(s) found:
   /usr/include/cephfs/types.h
+ rm -fr /tmp/install-deps.999737
Build step 'Execute shell' marked build as failure```

rishabh-d-dave · 2022-06-07T18:12:15Z

Looks good otherwise.

dparmar18 · 2022-06-07T19:09:58Z

@vshankar What spec file do I need to add this file path to? Also what way should I test it after adding the file-path in the respective spec file?

lxbsz · 2022-06-08T00:43:38Z

I think you can refer to what the %{_includedir}/cephfs/metrics/Types.h does in ceph.spec.in.

rishabh-d-dave · 2022-06-08T05:02:42Z

@lxbsz True. I and Dhairya figured the same yesterday but any idea how to re-run that job to test that change? And is possible to do it locally without too much hassle?

lxbsz · 2022-06-08T05:39:09Z

Maybe you can test this locally by using the docker, please see src/test/centos-8/. Or you can push this PR to the https://github.com/ceph/ceph-ci, it should fire a job to build the rpm.

dparmar18 · 2022-06-08T05:45:23Z

@lxbsz I can also see ceph.spec.in for centos. fedora and opensuse under src/test, Do i also need to add the file path to those spec files?

lxbsz · 2022-06-08T05:47:18Z

The others are all link files, you can check it. So no need.

dparmar18 · 2022-06-08T05:53:25Z

Thanks!

dparmar18 · 2022-06-08T05:54:52Z

Okay, but the build process would again take a few hours too, right?

lxbsz · 2022-06-08T05:57:19Z

...

It seems.

mdstypes.h contains both MDS-exclusive and client-shared structs. This PR splits it up into "mdstypes.h" and "sharedtypes.h". Fixes: https://tracker.ceph.com/issues/3998 Signed-off-by: Dhairya Parmar <dparmar@redhat.com>

Signed-off-by: Dhairya Parmar <dparmar@redhat.com>

dparmar18 · 2022-06-08T09:59:30Z

@vshankar looks like the builds are getting generated successfully in https://shaman.ceph.com/builds/ceph/ after I pushed my latest changes. Build with config that failed previously i.e. centos-x86_64 is built successfully now. PS: build name is 'wip-mds_split'

vshankar

https://tracker.ceph.com/projects/cephfs/wiki/Master#2022-June-20

github-actions bot added the cephfs Ceph File System label May 17, 2022

dparmar18 force-pushed the tracker3998 branch from b2fcb61 to 0ef7745 Compare May 17, 2022 06:21

dparmar18 mentioned this pull request May 17, 2022

split mds exclusive structs and shared ones #46275

Closed

14 tasks

dparmar18 marked this pull request as ready for review May 17, 2022 06:24

dparmar18 requested a review from a team May 17, 2022 06:25

batrick requested changes May 18, 2022

View reviewed changes

src/include/cephfs/sharedtypes.h Outdated Show resolved Hide resolved

src/include/cephfs/sharedtypes.h Outdated Show resolved Hide resolved

src/include/cephfs/sharedtypes.h Outdated Show resolved Hide resolved

src/mds/mdstypes.h Outdated Show resolved Hide resolved

dparmar18 force-pushed the tracker3998 branch from 5d117a3 to d6218d1 Compare May 23, 2022 10:53

batrick requested changes May 24, 2022

View reviewed changes

src/mds/mdstypes.h Outdated Show resolved Hide resolved

dparmar18 force-pushed the tracker3998 branch 2 times, most recently from 06b4934 to 781f836 Compare May 24, 2022 13:43

github-actions bot added the rgw label May 24, 2022

dparmar18 force-pushed the tracker3998 branch 2 times, most recently from 8e6d570 to e463968 Compare May 24, 2022 13:45

dparmar18 removed the rgw label May 24, 2022

batrick approved these changes May 24, 2022

View reviewed changes

dparmar18 changed the base branch from master to main May 25, 2022 05:38

neesingh-rh reviewed May 25, 2022

View reviewed changes

dparmar18 force-pushed the tracker3998 branch from e463968 to 1437773 Compare May 25, 2022 07:35

batrick added the needs-qa label May 25, 2022

nmshelke reviewed May 25, 2022

View reviewed changes

vshankar approved these changes Jun 1, 2022

View reviewed changes

vshankar added the wip-vshankar-testing label Jun 1, 2022

lxbsz approved these changes Jun 1, 2022

View reviewed changes

nmshelke approved these changes Jun 1, 2022

View reviewed changes

vshankar requested changes Jun 6, 2022

View reviewed changes

vshankar removed the wip-vshankar-testing label Jun 6, 2022

rishabh-d-dave approved these changes Jun 7, 2022

View reviewed changes

github-actions bot added the build/ops label Jun 8, 2022

dparmar18 added 2 commits June 8, 2022 11:49

mds: split up mdstypes

4cc3d62

mdstypes.h contains both MDS-exclusive and client-shared structs. This PR splits it up into "mdstypes.h" and "sharedtypes.h". Fixes: https://tracker.ceph.com/issues/3998 Signed-off-by: Dhairya Parmar <dparmar@redhat.com>

mds: add include/cephfs/types.h path in spec files

f2bfea5

Signed-off-by: Dhairya Parmar <dparmar@redhat.com>

dparmar18 force-pushed the tracker3998 branch from 2b11437 to f2bfea5 Compare June 8, 2022 06:19

vshankar approved these changes Jun 8, 2022

View reviewed changes

vshankar added the wip-vshankar-testing1 label Jun 8, 2022

vshankar approved these changes Jun 20, 2022

View reviewed changes

vshankar merged commit c34fd00 into ceph:main Jun 20, 2022

vshankar removed the wip-vshankar-testing1 label Jun 20, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

mds: split up mdstypes #46295

mds: split up mdstypes #46295

dparmar18 commented May 17, 2022 •

edited

rishabh-d-dave commented May 20, 2022

dparmar18 commented May 24, 2022

rishabh-d-dave commented May 24, 2022

rishabh-d-dave commented May 24, 2022 •

edited

dparmar18 commented May 24, 2022

neesingh-rh left a comment

dparmar18 commented May 25, 2022

nmshelke left a comment

vshankar left a comment

rishabh-d-dave commented Jun 7, 2022

dparmar18 commented Jun 7, 2022

lxbsz commented Jun 8, 2022

rishabh-d-dave commented Jun 8, 2022

lxbsz commented Jun 8, 2022

dparmar18 commented Jun 8, 2022

lxbsz commented Jun 8, 2022

dparmar18 commented Jun 8, 2022

dparmar18 commented Jun 8, 2022

lxbsz commented Jun 8, 2022

dparmar18 commented Jun 8, 2022

vshankar left a comment

mds: split up mdstypes #46295

mds: split up mdstypes #46295

Conversation

dparmar18 commented May 17, 2022 • edited

Contribution Guidelines

Checklist

rishabh-d-dave commented May 20, 2022

dparmar18 commented May 24, 2022

rishabh-d-dave commented May 24, 2022

rishabh-d-dave commented May 24, 2022 • edited

dparmar18 commented May 24, 2022

neesingh-rh left a comment

Choose a reason for hiding this comment

dparmar18 commented May 25, 2022

nmshelke left a comment

Choose a reason for hiding this comment

vshankar left a comment

Choose a reason for hiding this comment

rishabh-d-dave commented Jun 7, 2022

dparmar18 commented Jun 7, 2022

lxbsz commented Jun 8, 2022

rishabh-d-dave commented Jun 8, 2022

lxbsz commented Jun 8, 2022

dparmar18 commented Jun 8, 2022

lxbsz commented Jun 8, 2022

dparmar18 commented Jun 8, 2022

dparmar18 commented Jun 8, 2022

lxbsz commented Jun 8, 2022

dparmar18 commented Jun 8, 2022

vshankar left a comment

Choose a reason for hiding this comment

dparmar18 commented May 17, 2022 •

edited

rishabh-d-dave commented May 24, 2022 •

edited