osd: add asock command to dump the scrub queue #12728

liuchang0812 · 2017-01-01T04:54:47Z

add a public method to dumps scrubs
register new command to asock_admin

any comments is appreciated.

Fixes: http://tracker.ceph.com/issues/17861

Signed-off-by: liuchang0812 liuchang0812@gmail.com

liuchang0812 · 2017-01-01T05:13:55Z

FYI, result of this command:

[
    {  
      "pgid": "1.0",
        "sched_time": "2017-01-02 01:35:23.289862",
        "deadline": "2017-01-07 23:41:25.673073"
    },
    {   
        "pgid": "2.6",
        "sched_time": "2017-01-02 04:07:40.349184",
        "deadline": "2017-01-08 03:24:07.231452"
    },
    {   
        "pgid": "1.3",
        "sched_time": "2017-01-02 06:18:40.805239",
        "deadline": "2017-01-08 00:14:06.916350"
    },
    {   
        "pgid": "2.4",
        "sched_time": "2017-01-02 07:58:41.714257",
        "deadline": "2017-01-08 07:15:31.032673"
    },
    {   
        "pgid": "2.3",
        "sched_time": "2017-01-02 09:17:15.723569",
        "deadline": "2017-01-08 05:44:35.507823"
    },
    {   
        "pgid": "1.7",
        "sched_time": "2017-01-02 10:02:50.532476",
        "deadline": "2017-01-08 07:58:34.595284"
    },
    {   
        "pgid": "1.4",
        "sched_time": "2017-01-02 10:40:38.610703",
        "deadline": "2017-01-08 08:41:33.200372"
    },
    {   
        "pgid": "2.7",
        "sched_time": "2017-01-02 11:56:48.821839",
        "deadline": "2017-01-08 04:00:31.616621"
    },
    {   
        "pgid": "1.6",
        "sched_time": "2017-01-02 14:09:30.878554",
        "deadline": "2017-01-08 03:37:02.696721"
    },
    {   
        "pgid": "2.5",
        "sched_time": "2017-01-02 14:29:59.059526",
        "deadline": "2017-01-08 03:59:52.597162"
    },
    {   
        "pgid": "0.7",
        "sched_time": "2017-01-02 18:16:37.088916",
        "deadline": "2017-01-08 08:09:10.976245"
    }
]

and, xml result:

<sched scrubs>
 <scrub>
  <pgid>1.0</pgid>
  <sched_time>2017-01-02 01:35:23.289862</sched_time>
  <deadline>2017-01-07 23:41:25.673073</deadline>
 </scrub>
 <scrub>
  <pgid>2.6</pgid>
  <sched_time>2017-01-02 04:07:40.349184</sched_time>
  <deadline>2017-01-08 03:24:07.231452</deadline>
 </scrub>
 <scrub>
  <pgid>1.3</pgid>
  <sched_time>2017-01-02 06:18:40.805239</sched_time>
  <deadline>2017-01-08 00:14:06.916350</deadline>
 </scrub>
 <scrub>
  <pgid>2.4</pgid>
  <sched_time>2017-01-02 07:58:41.714257</sched_time>
  <deadline>2017-01-08 07:15:31.032673</deadline>
 </scrub>
 <scrub>
  <pgid>2.3</pgid>
  <sched_time>2017-01-02 09:17:15.723569</sched_time>
  <deadline>2017-01-08 05:44:35.507823</deadline>
 </scrub>
 <scrub>
  <pgid>1.7</pgid>
  <sched_time>2017-01-02 10:02:50.532476</sched_time>
  <deadline>2017-01-08 07:58:34.595284</deadline>
 </scrub>
 <scrub>
  <pgid>1.4</pgid>
  <sched_time>2017-01-02 10:40:38.610703</sched_time>
  <deadline>2017-01-08 08:41:33.200372</deadline>
 </scrub>
 <scrub>
  <pgid>2.7</pgid>
  <sched_time>2017-01-02 11:56:48.821839</sched_time>
  <deadline>2017-01-08 04:00:31.616621</deadline>
 </scrub>
 <scrub>
  <pgid>1.6</pgid>
  <sched_time>2017-01-02 14:09:30.878554</sched_time>
  <deadline>2017-01-08 03:37:02.696721</deadline>
 </scrub>
 <scrub>
  <pgid>2.5</pgid>
  <sched_time>2017-01-02 14:29:59.059526</sched_time>
  <deadline>2017-01-08 03:59:52.597162</deadline>
 </scrub>
 <scrub>
  <pgid>0.7</pgid>
  <sched_time>2017-01-02 18:16:37.088916</sched_time>
  <deadline>2017-01-08 08:09:10.976245</deadline>
 </scrub>
</sched scrubs>

tchaikov · 2017-01-03T08:10:06Z

src/osd/OSD.h

+    assert(f != nullptr);
+    Mutex::Locker l(sched_scrub_lock);
+
+    f->open_array_section("sched scrubs");


an XML tag cannot contain space in it. see https://www.w3.org/TR/2008/REC-xml-20081126/#NT-NameChar.

so probably we can simply put "scrubs" as the tag name?

tchaikov · 2017-01-03T08:20:13Z

src/osd/OSD.h

@@ -686,7 +686,7 @@ class OSDService {
  }

  void dumps_scrub(Formatter *f) {
-    assert(f!=nullptr);
+    assert(f != nullptr);


please squash this commit into the previous one.

ok, i will squash commits after review

xiexingguo · 2017-01-03T08:27:33Z

src/osd/OSD.cc

+  r = admin_socket->register_command("dump_scrubs",
+				     "dump_scrubs",
+				     asok_hook,
+				     "print schedlued scrubs");


s/schedlued/scheduled/

done. thanks for your review

tchaikov · 2017-01-03T08:28:11Z

src/osd/OSD.h

+      f->open_object_section("scrub");
+      f->dump_stream("pgid") << i.pgid;
+      f->dump_stream("sched_time") << i.sched_time;
+      f->dump_stream("deadline") << i.deadline;


maybe we can have a boolean field named "forced"? see http://tracker.ceph.com/issues/17861#note-5. i know, technically, it's redundant. but it helps user to understand this scrub. @athanatos what do you think?

it has been added. by the way, it seems that there isn't not a way to do a force scrub via ceph tools.

both "ceph osd scrub ${osd_num}" and "ceph pg scrub ${pg_num}" force a scrub job.

liuchang0812

updated

liuchang0812 · 2017-01-03T11:56:34Z

src/osd/OSD.cc

+  r = admin_socket->register_command("dump_scrubs",
+				     "dump_scrubs",
+				     asok_hook,
+				     "print schedlued scrubs");


done. thanks for your review

liuchang0812 · 2017-01-03T13:15:56Z

src/osd/OSD.h

+      f->open_object_section("scrub");
+      f->dump_stream("pgid") << i.pgid;
+      f->dump_stream("sched_time") << i.sched_time;
+      f->dump_stream("deadline") << i.deadline;


it has been added. by the way, it seems that there isn't not a way to do a force scrub via ceph tools.

athanatos · 2017-01-03T18:02:28Z

This seems reasonable to me. I'm ok with it if @tchaikov is.

tchaikov · 2017-01-04T06:02:40Z

@liuchang0812

nit, the change happens in "osd" but not in any of the cli tools, might want to change the prefix of the title to "osd:".

liuchang0812 · 2017-01-04T06:17:51Z

@tchaikov OK, i will change title and test again.

tchaikov · 2017-01-04T06:22:07Z

@liuchang0812 sorry for the confusion. and please note that the title of this pull request is different from the one of your commit. i recommend change the later.

liuchang0812 · 2017-01-04T06:26:50Z

😄 @tchaikov I get it now

* add a public method to dumps scrubs * register new command "dump_scrubs" to asock_admin Fixes: http://tracker.ceph.com/issues/17861 Signed-off-by: liuchang0812 <liuchang0812@gmail.com>

liuchang0812 · 2017-01-04T06:46:33Z

@tchaikov Updated, Waiting for test result.

tchaikov · 2017-01-05T14:06:39Z

liuchang0812 force-pushed the fix-17861 branch from 71c5a74 to 71f1016 Compare January 1, 2017 04:56

tchaikov added common feature labels Jan 3, 2017

tchaikov requested changes Jan 3, 2017

View reviewed changes

xiexingguo requested changes Jan 3, 2017

View reviewed changes

tchaikov requested changes Jan 3, 2017

View reviewed changes

liuchang0812 force-pushed the fix-17861 branch from 91545c1 to 7d1a627 Compare January 3, 2017 13:13

liuchang0812 commented Jan 3, 2017

View reviewed changes

xiexingguo approved these changes Jan 4, 2017

View reviewed changes

tchaikov added the needs-qa label Jan 4, 2017

tchaikov self-assigned this Jan 4, 2017

liuchang0812 changed the title ~~osd/tool: add asock command to dump the scrub queue~~ osd: add asock command to dump the scrub queue Jan 4, 2017

tchaikov approved these changes Jan 4, 2017

View reviewed changes

osd: add asock command to dump the scrub queue

7542a35

* add a public method to dumps scrubs * register new command "dump_scrubs" to asock_admin Fixes: http://tracker.ceph.com/issues/17861 Signed-off-by: liuchang0812 <liuchang0812@gmail.com>

liuchang0812 force-pushed the fix-17861 branch from 7d1a627 to 7542a35 Compare January 4, 2017 06:43

tchaikov added the wip-kefu-testing label Jan 4, 2017

tchaikov merged commit 0d5780c into ceph:master Jan 5, 2017

liuchang0812 deleted the fix-17861 branch January 5, 2017 14:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

osd: add asock command to dump the scrub queue #12728

osd: add asock command to dump the scrub queue #12728

liuchang0812 commented Jan 1, 2017 •

edited by tchaikov

Loading

liuchang0812 commented Jan 1, 2017 •

edited

Loading

tchaikov Jan 3, 2017

liuchang0812 Jan 3, 2017

tchaikov Jan 3, 2017

liuchang0812 Jan 3, 2017

xiexingguo Jan 3, 2017

liuchang0812 Jan 3, 2017

tchaikov Jan 3, 2017

liuchang0812 Jan 3, 2017

tchaikov Jan 4, 2017

liuchang0812 left a comment

liuchang0812 Jan 3, 2017

liuchang0812 Jan 3, 2017

athanatos commented Jan 3, 2017

tchaikov commented Jan 4, 2017

liuchang0812 commented Jan 4, 2017

tchaikov commented Jan 4, 2017

liuchang0812 commented Jan 4, 2017

liuchang0812 commented Jan 4, 2017

tchaikov commented Jan 5, 2017

osd: add asock command to dump the scrub queue #12728

osd: add asock command to dump the scrub queue #12728

Conversation

liuchang0812 commented Jan 1, 2017 • edited by tchaikov Loading

liuchang0812 commented Jan 1, 2017 • edited Loading

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

liuchang0812 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

athanatos commented Jan 3, 2017

tchaikov commented Jan 4, 2017

liuchang0812 commented Jan 4, 2017

tchaikov commented Jan 4, 2017

liuchang0812 commented Jan 4, 2017

liuchang0812 commented Jan 4, 2017

tchaikov commented Jan 5, 2017

liuchang0812 commented Jan 1, 2017 •

edited by tchaikov

Loading

liuchang0812 commented Jan 1, 2017 •

edited

Loading