Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

luminous: mds: move remaining containers in CDentry/CDir/CInode to mempool #20527

Merged
merged 13 commits into from
Mar 27, 2018

Conversation

batrick
Copy link
Member

@batrick batrick commented Feb 22, 2018

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit e63e17a)
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 0635dac)
This is necessary to allow many interfaces to take mempool allocated strings.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 0c8ec93)

 Conflicts:
	src/include/encoding.h
	src/mds/CDir.cc
	src/mds/MDCache.cc
	src/mds/Migrator.cc
	src/mds/Server.cc
	src/mds/SnapClient.h
	src/mds/journal.cc
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 43af5af)
Partial-fix: http://tracker.ceph.com/issues/21402

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit b7fa3ee)
Partial-fix: http://tracker.ceph.com/issues/21402

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 6b7073f)

Conflicts:
	src/mds/CDir.cc
	src/mds/CInode.cc
	src/mds/MDBalancer.cc
	src/mds/MDCache.cc
	src/messages/MDirUpdate.h
Partial-fix: http://tracker.ceph.com/issues/21402

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 920ea85)
Partial-fix: http://tracker.ceph.com/issues/21402

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 7e2f59a)

 Conflicts:
	src/mds/CInode.cc
	src/mds/Locker.cc
	src/mds/MDCache.cc
	src/mds/Server.cc
	src/mds/mdstypes.cc
	src/mds/mdstypes.h
Partial-fix: http://tracker.ceph.com/issues/21402

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit b106408)
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit e9be29c)
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 46c25ab)
This is a compatibility band-aid on this backport.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
@batrick batrick added the cephfs Ceph File System label Feb 22, 2018
@batrick batrick force-pushed the i22972 branch 4 times, most recently from 9408562 to f5922c9 Compare February 22, 2018 21:12
Luminous uses C++11. These fixes correct compiler errors.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
@batrick batrick changed the title [WIP] luminous: mds: move remaining containers in CDentry/CDir/CInode to mempool luminous: mds: move remaining containers in CDentry/CDir/CInode to mempool Feb 22, 2018
@batrick batrick added this to the luminous milestone Feb 22, 2018
@batrick
Copy link
Member Author

batrick commented Feb 28, 2018

@yuriw
Copy link
Contributor

yuriw commented Mar 21, 2018

@batrick
Copy link
Member Author

batrick commented Mar 27, 2018

Looks good to me @yuriw. I cannot add approval review as it's my PR.

@yuriw
Copy link
Contributor

yuriw commented Mar 27, 2018

@batrick @liewegas this is ready for merge pls approve

@batrick
Copy link
Member Author

batrick commented Mar 27, 2018

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

@batrick batrick merged commit 3fea965 into ceph:luminous Mar 27, 2018
batrick added a commit that referenced this pull request Mar 27, 2018
* refs/pull/20527/head:
	mds: various fixes for backport
	mds: convert to boost::string_view
	test/encoding: refactor to avoid escaping shell magic
	mds: minor refactor of SimpleLock
	mds: track Capability in mempool
	mds: move CInode container members to mempool
	mds: move CDentry container members to mempool
	mds: move CDir container members to mempool
	mds: put MDSCacheObject compact_map in mempool
	common: use size_t for object size
	mds: convert to allocator agnostic string_view
	mds: simplify initialization
	compact_*: support mempool allocated containers

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
@batrick batrick deleted the i22972 branch March 27, 2018 22:56
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.

3 participants