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

doc: Update CephFS disaster recovery documentation #12370

Merged
merged 1 commit into from Feb 17, 2017

Conversation

wido
Copy link
Member

@wido wido commented Dec 7, 2016

Better documentation about spawning multiple workers to speed
up the recovery proces.

Signed-off-by: Wido den Hollander wido@42on.com

@wido
Copy link
Member Author

wido commented Dec 7, 2016

@jcsp Could you take a look at this one?

@jcsp jcsp added the cephfs Ceph File System label Dec 7, 2016
@jcsp jcsp self-assigned this Dec 7, 2016
@wido wido requested a review from jcsp January 25, 2017 19:52
@wido
Copy link
Member Author

wido commented Jan 25, 2017

@jcsp Could you take a look at this one?

Copy link
Contributor

@jcsp jcsp left a comment

Choose a reason for hiding this comment

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

The doc changes look good, but the instances of "dendl" in DataScan.cc need to change to just newlines.

@@ -32,14 +32,16 @@ void DataScan::usage()
{
std::cout << "Usage: \n"
<< " cephfs-data-scan init [--force-init]\n"
<< " cephfs-data-scan scan_extents [--force-pool] <data pool name>\n"
<< " cephfs-data-scan scan_inodes [--force-pool] [--force-corrupt] <data pool name>\n"
<< " cephfs-data-scan scan_extents [--force-pool] [--worker_n N --worker_m M] <data pool name>" << dendl;
Copy link
Contributor

Choose a reason for hiding this comment

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

The replacement of "\n" with "<< dendl;" is incorrect here (and does not compile)

Copy link
Member Author

Choose a reason for hiding this comment

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

Sure? It compiled I thought and the tests say so. I will change it anyway.

@jcsp
Copy link
Contributor

jcsp commented Jan 26, 2017

@wido wow, did I really leave this for so long? Sorry!

@wido
Copy link
Member Author

wido commented Jan 26, 2017

@jcsp No problem! How does this look now?

@@ -33,14 +33,16 @@ void DataScan::usage()
{
std::cout << "Usage: \n"
<< " cephfs-data-scan init [--force-init]\n"
<< " cephfs-data-scan scan_extents [--force-pool] <data pool name>\n"
<< " cephfs-data-scan scan_inodes [--force-pool] [--force-corrupt] <data pool name>\n"
<< " cephfs-data-scan scan_extents [--force-pool] [--worker_n N --worker_m M] <data pool name>" << std::endl;
Copy link
Contributor

Choose a reason for hiding this comment

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

This whole section is one statement, like std::cout << A << B << C;

What you're changing it to is something like std::cout << A << B << std::endl; << C;, it doesn't make sense.

You could do it by using std::endl and a trailing "<<" instead of ";", but really I'd just use "\n" like the original code.

@jcsp
Copy link
Contributor

jcsp commented Jan 26, 2017

The reason it looks like it compiles is that the checks that run on PRs are the unit tests: they don't actually build the whole tree (maybe we should change that)

Better documentation about spawning multiple workers to speed
up the recovery proces.

Signed-off-by: Wido den Hollander <wido@42on.com>
@wido
Copy link
Member Author

wido commented Jan 30, 2017

@jcsp: Argh, dôh. Compiling takes such a time on my systems that you sometimes look at the code only. Fixed now.

@wido
Copy link
Member Author

wido commented Feb 17, 2017

@jcsp: Small ping again? ;)

@jcsp jcsp merged commit f5ac182 into ceph:master Feb 17, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cephfs Ceph File System documentation
Projects
None yet
2 participants