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

client: populate metadata during mount #12915

Merged
merged 1 commit into from Jan 16, 2017
Merged

client: populate metadata during mount #12915

merged 1 commit into from Jan 16, 2017

Conversation

jcsp
Copy link
Contributor

@jcsp jcsp commented Jan 13, 2017

This way we avoid having to over-write the "root"
metadata during mount, and any user-set overrides (such
as bad values injected by tests) will survive.

Because Client instances may also open sessions without
mounting to send commands, add a call into populate_metadata
from mds_command as well.

Fixes: http://tracker.ceph.com/issues/18361
Signed-off-by: John Spray john.spray@redhat.com

This way we avoid having to over-write the "root"
metadata during mount, and any user-set overrides (such
as bad values injected by tests) will survive.

Because Client instances may also open sessions without
mounting to send commands, add a call into populate_metadata
from mds_command as well.

Fixes: http://tracker.ceph.com/issues/18361
Signed-off-by: John Spray <john.spray@redhat.com>
@@ -1943,7 +1941,9 @@ void Client::populate_metadata()
metadata["entity_id"] = cct->_conf->name.get_id();

// Our mount position
metadata["root"] = cct->_conf->client_mountpoint;
Copy link
Contributor

@ukernel ukernel Jan 13, 2017

Choose a reason for hiding this comment

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

@client_mountpoint is not referenced any more. remove it from config option?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's still used from ceph_fuse.cc (and via the "-r" argument)

@jcsp
Copy link
Contributor Author

jcsp commented Jan 13, 2017

@jcsp jcsp merged commit 8135611 into ceph:master Jan 16, 2017
@jcsp jcsp deleted the wip-18361 branch January 16, 2017 21:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug-fix cephfs Ceph File System
Projects
None yet
2 participants