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

tools/ceph_kvstore_tool: Move summary output to print_summary #26666

Merged
merged 1 commit into from
Mar 1, 2019

Conversation

badone
Copy link
Contributor

@badone badone commented Feb 27, 2019

Post 301a642 we are still seeing an ICE
in the copy_store_to code. Moving the summary printing to its own
function alleviates the issue.

Signed-off-by: Brad Hubbard bhubbard@redhat.com

  • References tracker ticket
  • Updates documentation if necessary
  • Includes tests for new functionality or reproducer for bug

@@ -179,6 +179,19 @@ bool StoreTool::rm_prefix(const string& prefix)
return (ret == 0);
}

void StoreTool::print_summary(const uint64_t total_keys, const uint64_t total_size,
const uint64_t total_txs, const string &store_path,
const string &other_path, const int duration) const
Copy link
Contributor

Choose a reason for hiding this comment

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

nit, might want to put & right next to string. as it's part of type.

@@ -62,6 +62,9 @@ class StoreTool
ceph::bufferlist& val);
bool rm(const std::string& prefix, const std::string& key);
bool rm_prefix(const std::string& prefix);
void print_summary(const uint64_t total_keys, const uint64_t total_size,
const uint64_t total_txs, const string &store_path,
Copy link
Contributor

Choose a reason for hiding this comment

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

ditto.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Bah! Must be a clang-format thing... using LLVM style...

@@ -62,6 +62,9 @@ class StoreTool
ceph::bufferlist& val);
bool rm(const std::string& prefix, const std::string& key);
bool rm_prefix(const std::string& prefix);
void print_summary(const uint64_t total_keys, const uint64_t total_size,
const uint64_t total_txs, const string& store_path,
Copy link
Contributor

Choose a reason for hiding this comment

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

s/string/std::string/

we'd better not relying on using namespace std or using std::string somewhere else.

Post 301a642 we are still seeing an ICE
in the copy_store_to code. Moving the summary printing to its own
function alleviates the issue.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
@badone
Copy link
Contributor Author

badone commented Feb 27, 2019

Copy link
Member

@dmick dmick left a comment

Choose a reason for hiding this comment

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

voodoo.

Copy link
Member

@xiexingguo xiexingguo left a comment

Choose a reason for hiding this comment

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

Honestly I did not read the content carefully. But I'd like to contribute my +1 vote here since my local compiler is happy again with this patch applied.

Thanks!

@xiexingguo
Copy link
Member

It would be much appreciated if we can get this patch merged ASAP.

@badone
Copy link
Contributor Author

badone commented Mar 1, 2019

Testing it now.

@badone
Copy link
Contributor Author

badone commented Mar 1, 2019

Seems like the testing queue has stalled. I'll check it in the morning APAC time.

@badone badone merged commit c5036f9 into ceph:master Mar 1, 2019
@badone badone deleted the wip-kvstore_tool-ice branch March 1, 2019 23:14
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.

4 participants