osd: add "heap *" admin command #13073

chardan · 2017-01-23T20:26:59Z

Extends the OSD admin console with a heap profiling command.

jecluis · 2017-01-23T21:47:18Z

@chardan mentioned one of the commits (I'm guessing the rgw one) mistakenly made it into the branch. He will be rebasing the branch and repushing soon.

jdurgin · 2017-01-28T04:13:39Z

qa/workunits/cephtool/test.sh

+
+  [[ $do_test -eq 0 ]] && return 0
+
+  admin_socket = "--admin-deamon out/osd.0.asok"


typo: should be daemon

Good eyes! Thanks.

this still needs to be fixed it looks like?

...if at first, you don't succeed... (should be corrected now, thank you).

jdurgin · 2017-01-28T04:16:11Z

nice cleanup to share the command implementation! looks like it'll need a rebase for the command->admin_command rename

jdurgin · 2017-01-28T04:18:12Z

src/osd/OSD.cc

+  string cmd;
+  std::vector<std::string> cmd_vec;
+
+  if (false == cmd_getval(&cct, cmdmap, "heapcmd", cmd)) {


usually we don't do yoda conditions - any reason to avoid !cmd_getval(...) here?

lol @"yoda conditions". No reason here, and changing it makes it consistent with the rest of the function.

jdurgin · 2017-01-30T23:02:34Z

The build error in jenkins looks real:

/home/jenkins-build/build/workspace/ceph-pull-requests/src/osd/OSD.cc:1951:14: error: ‘command’ was not declared in this scope
   } else if (command == "dump_objectstore_kv_stats") {
              ^

other than that lgtm.

chardan · 2017-01-31T20:53:38Z

Not sure why I didn't see that build issue locally, but I just did a clean build with this patch.

jdurgin · 2017-02-02T23:47:10Z

I'm getting the same error as jenkins when building locally - perhaps due to merging with the latest master

tchaikov · 2017-02-03T06:53:24Z

@chardan could you squash the commits into a single one?

chardan · 2017-02-03T16:45:42Z

@tchaikov Sure-- would you rather see all of them together, or do you mean that you want the "corrections" commits squashed? Thanks!

tchaikov · 2017-02-03T16:54:52Z

@chardan the latter. =) sorry for the confusion!

liuchang0812 · 2017-02-03T17:38:35Z

Hi, it would be better to update commit message and PR' title, likes: osd: cleanup "heap *" asock commands

chardan · 2017-02-03T20:36:23Z

@tchaikov: I'm working on figuring out how to do that, but it looks like it is beyond my feeble git-fu at this time. (I believe the problem is the merge commit-- when I "git rebase -i HEAD~2", it's picking up all the individual commits in the merge. I'm not sure what the right way around this is, ideas more than welcomed!)

tchaikov · 2017-02-04T03:00:32Z

@chardan you need to remove the merge commit first, here is how i do this

git rebase -i 5c18dd4~
# 1. remove all commits way down to 8c79cd1 (exclusive) in the editor
# 2. resolve the conflict
# 3. reorder the commits and squash the related ones
# 4. voilà

jecluis · 2017-02-04T11:46:53Z

Personally, I think the commit messages are verbose enough as they are, and do not necessarily need to be changed.

However, I'm with @tchaikov on the commits needing squashing, and I would not mind the commits being properly rebased on top of master instead of having merge commits polluting the branch's history :)

(edit: seems like I didn't refresh the page and the party continued in the mean time; consider above comments with that in mind)

yuriw · 2017-02-05T23:12:16Z

test this please

yuriw · 2017-02-05T23:45:12Z

@chardan @jdurgin FYI Build failed:

[ 34%] Building CXX object src/CMakeFiles/common-objs.dir/log/Log.cc.o
/home/jenkins-build/build/workspace/ceph-pull-requests/src/osd/OSD.cc: In member function ‘bool OSD::asok_command(std::string, cmdmap_t&, std::string, std::ostream&)’:
/home/jenkins-build/build/workspace/ceph-pull-requests/src/osd/OSD.cc:1958:14: error: ‘command’ was not declared in this scope
} else if (command == "calc_objectstore_db_histogram") {
^
[ 34%] Building CXX object src/osd/CMakeFiles/osd.dir/Watch.cc.o

tchaikov · 2017-02-06T02:57:35Z

qa/workunits/cephtool/test.sh

@@ -1726,7 +1726,7 @@ function test_admin_heap_profiler()

  [[ $do_test -eq 0 ]] && return 0

-  admin_socket = "--admin-deamon out/osd.0.asok"
+  admin_socket = "--admin-daemon out/osd.0.asok"


please squash this change into 48116a6

tchaikov · 2017-02-06T02:58:25Z

src/osd/OSD.cc

@@ -1951,9 +1951,9 @@ bool OSD::asok_command(string admin_command, cmdmap_t& cmdmap, string format,
    f->dump_bool("success", success);
    f->dump_int("value", value);
    f->close_section();
-  } else if (command == "dump_objectstore_kv_stats") {
+  } else if (admin_command == "dump_objectstore_kv_stats") {


and squash this change into 1371e27

tchaikov · 2017-02-06T03:01:40Z

src/osd/OSD.cc

+namespace ceph { 
+namespace osd_cmds { 
+
+int heap(CephContext& cct, cmdmap_t& cmdmap, Formatter& f, std::ostream& os)


nit, this helper function should be in an anonymous namespace.

The reason I've added them to a named namespace is that I foresee moving these into a new source module. One factor is that this having a function that works in both consoles is a different pattern than already exists in the code; they have to be given some sort of name, and I think the namespace helps to make the purpose clear. As more such commands are added, I'm confident the organizational benefit will provide better returns than for this single function.

tchaikov · 2017-02-06T03:04:01Z

src/osd/OSD.h

+namespace ceph { 
+namespace osd_cmds { 
+
+int heap(CephContext& cct, cmdmap_t& cmdmap, Formatter& f, std::ostream& os);


it's not necessary to have this declaration in the header file. it's only used in OSD.cc.

I agree, will do. I think ultimately the "real" right solution is to split these into their own source file away from the other OSD.cc code, but that's a much more significant change.

tchaikov · 2017-02-06T03:05:29Z

src/osd/OSD.cc

    store->get_db_statistics(f);
-  } else if (command == "dump_scrubs") {
+  } else if (admin_command == "dump_scrubs") {


you should also change https://github.com/ceph/ceph/pull/13073/files#diff-fa6c2eba8356ae1442d1bf749beacfdfR1958.

tchaikov · 2017-02-06T03:08:38Z

src/osd/OSD.cc

@@ -1782,20 +1782,20 @@ class OSDSocketHook : public AdminSocketHook {
  OSD *osd;
 public:
  explicit OSDSocketHook(OSD *o) : osd(o) {}
-  bool call(std::string command, cmdmap_t& cmdmap, std::string format,
+  bool call(std::string admin_command, cmdmap_t& cmdmap, std::string format,


i don't understand how this helps us to search the admin_command? IIUC, all commands in OSD.cc are admin commands.

Consider the console commands, around line 5509 or so. It was not obvious to me which of these were "admin" vs. "console" commands at first, and having the above change in would have saved me quite a bit of time. That said, the reason the change is in a separate commit is because it's indeed optional; if there are a lot of strong feelings against it, we don't need to include it, but I know I would have found it helpful.

chardan · 2017-02-10T20:04:36Z

Any next steps or things I should attend to here? Thanks to everyone for the great input!

tchaikov · 2017-03-31T04:25:04Z

@chardan needs rebase.

Fixes: http://tracker.ceph.com/issues/15475 Signed-off-by: Jesse Williamson <jwilliamson@suse.de>

Signed-off-by: Jesse Williamson <jwilliamson@suse.de>

jdurgin · 2017-04-04T18:13:22Z

jenkins: retest this please

rebased.

jecluis added core feature labels Jan 23, 2017

chardan force-pushed the jfw-wip-15475-admin_heap_command branch from 21a8ef0 to 894f117 Compare January 23, 2017 22:30

jdurgin reviewed Jan 28, 2017

View reviewed changes

jdurgin approved these changes Feb 3, 2017

View reviewed changes

jdurgin added the needs-qa label Feb 3, 2017

tchaikov changed the title ~~Jfw wip 15475 admin heap command~~ osd: add "heap *" admin command Feb 3, 2017

chardan force-pushed the jfw-wip-15475-admin_heap_command branch 2 times, most recently from 832f0ae to 8c79cd1 Compare February 3, 2017 20:34

chardan force-pushed the jfw-wip-15475-admin_heap_command branch from 8c79cd1 to b093bf5 Compare February 4, 2017 20:36

tchaikov previously requested changes Feb 6, 2017

View reviewed changes

tchaikov removed the needs-qa label Feb 6, 2017

chardan force-pushed the jfw-wip-15475-admin_heap_command branch from b093bf5 to 8e2734f Compare February 6, 2017 19:42

tchaikov added the needs-qa label Feb 7, 2017

yuriw added the wip-yuri2-testing label Feb 7, 2017

yuriw added wip-yuri-testing and removed wip-yuri2-testing labels Feb 8, 2017

liewegas removed needs-qa wip-yuri-testing labels Feb 8, 2017

chardan force-pushed the jfw-wip-15475-admin_heap_command branch from 8e2734f to 7e01e47 Compare February 8, 2017 23:21

This was referenced Feb 9, 2017

osd: remove sortbitwise thrashing #13296

Merged

mon,osd: luminous feature bits, require flags, upgrade gates #13278

Merged

common, osd, tools: Add histograms to performance counters #12829

Merged

chardan force-pushed the jfw-wip-15475-admin_heap_command branch 2 times, most recently from 4511cd7 to 38903e2 Compare March 7, 2017 17:52

jdurgin added the needs-qa label Mar 21, 2017

tchaikov added the wip-kefu-testing label Mar 23, 2017

Jesse Williamson added 4 commits March 31, 2017 01:22

osd: Extends admin console with a "heap" memory profiling command.

75b5749

Fixes: http://tracker.ceph.com/issues/15475 Signed-off-by: Jesse Williamson <jwilliamson@suse.de>

osd: Unifies heap command for OSD console and admin interface.

fc0949f

Signed-off-by: Jesse Williamson <jwilliamson@suse.de>

osd: Add test for admin heap profiling command.

23c0264

Signed-off-by: Jesse Williamson <jwilliamson@suse.de>

osd: changes "command" to "admin_command" for admin commands.

10e6d1e

Signed-off-by: Jesse Williamson <jwilliamson@suse.de>

chardan force-pushed the jfw-wip-15475-admin_heap_command branch from 38903e2 to 2823b75 Compare March 31, 2017 08:33

osd: heap profiling cleanups in response to review notes, build fixes.

fc4a4aa

Signed-off-by: Jesse Williamson <jwilliamson@suse.de>

chardan force-pushed the jfw-wip-15475-admin_heap_command branch from 2823b75 to fc4a4aa Compare April 3, 2017 08:14

tchaikov removed the wip-kefu-testing label Apr 5, 2017

liewegas added the wip-sage-testing label Apr 8, 2017

liewegas merged commit 7e547a1 into ceph:master Apr 10, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

osd: add "heap *" admin command #13073

osd: add "heap *" admin command #13073

chardan commented Jan 23, 2017

jecluis commented Jan 23, 2017

jdurgin Jan 28, 2017

chardan Jan 28, 2017

liewegas Feb 8, 2017

chardan Feb 8, 2017

jdurgin commented Jan 28, 2017

jdurgin Jan 28, 2017

chardan Jan 28, 2017

jdurgin commented Jan 30, 2017

chardan commented Jan 31, 2017

jdurgin commented Feb 2, 2017

tchaikov commented Feb 3, 2017

chardan commented Feb 3, 2017

tchaikov commented Feb 3, 2017 •

edited

liuchang0812 commented Feb 3, 2017

chardan commented Feb 3, 2017 •

edited

tchaikov commented Feb 4, 2017

jecluis commented Feb 4, 2017 •

edited

yuriw commented Feb 5, 2017

yuriw commented Feb 5, 2017 •

edited

tchaikov Feb 6, 2017

tchaikov Feb 6, 2017

chardan Feb 6, 2017

tchaikov Feb 6, 2017

chardan Feb 6, 2017

tchaikov Feb 6, 2017

chardan Feb 6, 2017

tchaikov Feb 6, 2017

tchaikov Feb 6, 2017

chardan Feb 6, 2017

chardan commented Feb 10, 2017

tchaikov commented Mar 31, 2017

jdurgin commented Apr 4, 2017


		[[ $do_test -eq 0 ]] && return 0

		admin_socket = "--admin-deamon out/osd.0.asok"

osd: add "heap *" admin command #13073

osd: add "heap *" admin command #13073

Conversation

chardan commented Jan 23, 2017

jecluis commented Jan 23, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jdurgin commented Jan 28, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jdurgin commented Jan 30, 2017

chardan commented Jan 31, 2017

jdurgin commented Feb 2, 2017

tchaikov commented Feb 3, 2017

chardan commented Feb 3, 2017

tchaikov commented Feb 3, 2017 • edited

liuchang0812 commented Feb 3, 2017

chardan commented Feb 3, 2017 • edited

tchaikov commented Feb 4, 2017

jecluis commented Feb 4, 2017 • edited

yuriw commented Feb 5, 2017

yuriw commented Feb 5, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chardan commented Feb 10, 2017

tchaikov commented Mar 31, 2017

jdurgin commented Apr 4, 2017

tchaikov commented Feb 3, 2017 •

edited

chardan commented Feb 3, 2017 •

edited

jecluis commented Feb 4, 2017 •

edited

yuriw commented Feb 5, 2017 •

edited