rbd: add snapshot count in rbd info #21292

zhengchengyao · 2018-04-09T03:00:01Z

No description provided.

zhengchengyao · 2018-04-09T08:40:38Z

retest this please

dillaman

You will also need to update [1] since the output of rbd info has changed.

[1] https://github.com/ceph/ceph/blob/master/src/test/cli-integration/rbd/formatted-output.t

dillaman · 2018-04-09T12:11:11Z

src/tools/rbd/action/Info.cc

+  std::vector<librbd::snap_info_t> snaps;
+  int r, r1;
+
+  r1 = image.snap_list(snaps);


Nit: no need for a new r1 variable

dillaman

lgtm

dillaman · 2018-04-09T19:12:22Z

@zy751713126 Can you rebase against the latest version of the master branch and repush?

zhengchengyao · 2018-04-10T01:02:14Z

I have rebased the latest version and repushed.
thanks，dillaman.

dillaman · 2018-04-10T14:34:20Z

retest this please

zhengchengyao · 2018-04-17T11:02:55Z

retest this please

dillaman · 2018-04-17T11:45:47Z

@zy751713126 The formatted output test fails [1]:

[1] http://qa-proxy.ceph.com/teuthology/jdillaman-2018-04-13_12:10:29-rbd-wip-jd-testing-distro-basic-smithi/2394476/teuthology.log

dillaman · 2018-04-20T14:31:23Z

src/test/cli-integration/rbd/formatted-output.t

  [^^]+ (re)
+  \tblock_name_prefix: rb.0.* (glob)


Nit: fails here

dillaman · 2018-04-20T14:31:37Z

src/test/cli-integration/rbd/formatted-output.t

  [^^]+ (re)
+  \tblock_name_prefix: rb.0.* (glob)


Nit: fails here

dillaman · 2018-04-20T14:31:58Z

src/test/cli-integration/rbd/formatted-output.t

  [^^]+ (re)
+  \tblock_name_prefix: rbd_data.* (glob)


Nit: fails here

zhengchengyao · 2018-04-25T05:01:30Z

@dillaman hi, dillaman, all checks of this patch have passed, could you help me merge it? thanks a lot.

dillaman · 2018-04-27T12:36:40Z

Still is failing the same test: http://qa-proxy.ceph.com/teuthology/jdillaman-2018-04-26_17:23:27-rbd-wip-jd-testing-distro-basic-smithi/2443289/teuthology.log

Signed-off-by: Zheng Yin <zhengyin@huayun.com>

zhengchengyao · 2018-05-03T08:22:06Z

retest this please

dillaman · 2018-05-10T01:21:37Z

... still failing the same test: http://qa-proxy.ceph.com/teuthology/jdillaman-2018-05-09_19:09:24-rbd-wip-jd-testing-distro-basic-smithi/2511628/teuthology.log

zhengchengyao · 2018-05-10T03:59:13Z

2018-05-10T00:32:07.207 INFO:tasks.cram.client.0.smithi145.stdout:@@ -59,7 +59,7 @@
2018-05-10T00:32:07.207 INFO:tasks.cram.client.0.smithi145.stdout: \tsize 1GiB in 256 objects (esc)
2018-05-10T00:32:07.207 INFO:tasks.cram.client.0.smithi145.stdout: \torder 22 (4MiB objects) (esc)
2018-05-10T00:32:07.207 INFO:tasks.cram.client.0.smithi145.stdout: [^^]+ (re)
2018-05-10T00:32:07.207 INFO:tasks.cram.client.0.smithi145.stdout:- \tblock_name_prefix: rb.0.* (glob)
2018-05-10T00:32:07.207 INFO:tasks.cram.client.0.smithi145.stdout:+ \tblock_name_prefix: rb.0.1044.625558ec (esc)
2018-05-10T00:32:07.208 INFO:tasks.cram.client.0.smithi145.stdout: \tformat: 1 (esc)
2018-05-10T00:32:07.208 INFO:tasks.cram.client.0.smithi145.stdout: $ rbd info foo --format json | python -mjson.tool | sed 's/,$/, /'
2018-05-10T00:32:07.208 INFO:tasks.cram.client.0.smithi145.stdout: {
2018-05-10T00:32:07.208 INFO:tasks.cram.client.0.smithi145.stdout:@@ -92,7 +92,7 @@
2018-05-10T00:32:07.208 INFO:tasks.cram.client.0.smithi145.stdout: \tsize 1GiB in 256 objects (esc)
2018-05-10T00:32:07.208 INFO:tasks.cram.client.0.smithi145.stdout: \torder 22 (4MiB objects) (esc)
2018-05-10T00:32:07.208 INFO:tasks.cram.client.0.smithi145.stdout: [^^]+ (re)
2018-05-10T00:32:07.208 INFO:tasks.cram.client.0.smithi145.stdout:- \tblock_name_prefix: rb.0.* (glob)
2018-05-10T00:32:07.209 INFO:tasks.cram.client.0.smithi145.stdout:+ \tblock_name_prefix: rb.0.1044.625558ec (esc)
2018-05-10T00:32:07.209 INFO:tasks.cram.client.0.smithi145.stdout: \tformat: 1 (esc)
2018-05-10T00:32:07.209 INFO:tasks.cram.client.0.smithi145.stdout: \tprotected: False (esc)
2018-05-10T00:32:07.209 INFO:tasks.cram.client.0.smithi145.stdout: $ rbd info foo@snap --format json | python -mjson.tool | sed 's/,$/, /'
2018-05-10T00:32:07.209 INFO:tasks.cram.client.0.smithi145.stdout:# Ran 1 tests, 0 skipped, 1 failed.

hi, @dillaman , I am a newcomer，I don‘t know how to write block_name_prefix output format，could you please help me to give directions, thanks a lot.

dillaman · 2018-05-10T18:57:51Z

Manually merged PR after fixing test.

dillaman · 2018-05-10T18:58:42Z

@zy751713126 The issue was that you added block_name_prefix lines to the test when you were should have added ```snapshot_count" lines.

rbd: add snapshot count in rbd info Reviewed-by: Jason Dillaman <dillaman@redhat.com>

zhengchengyao · 2018-05-11T00:58:22Z

thanks

zhengchengyao force-pushed the snapshot_count branch from 5827330 to 4f30655 Compare April 9, 2018 05:15

dillaman changed the title ~~rbd/info: add snapshot count in rbd info~~ rbd: add snapshot count in rbd info Apr 9, 2018

dillaman reviewed Apr 9, 2018

View reviewed changes

dillaman added feature rbd labels Apr 9, 2018

zhengchengyao force-pushed the snapshot_count branch from 4f30655 to 3dfdef3 Compare April 9, 2018 14:36

dillaman approved these changes Apr 9, 2018

View reviewed changes

zhengchengyao force-pushed the snapshot_count branch from 3dfdef3 to cec56e4 Compare April 10, 2018 00:59

dillaman added the needs-qa label Apr 10, 2018

dillaman added the wip-jason-testing label Apr 13, 2018

zhengchengyao force-pushed the snapshot_count branch from cec56e4 to 79cd8a8 Compare April 17, 2018 08:28

dillaman removed needs-qa wip-jason-testing labels Apr 17, 2018

zhengchengyao force-pushed the snapshot_count branch from 79cd8a8 to 6865894 Compare April 18, 2018 03:35

dillaman reviewed Apr 20, 2018

View reviewed changes

zhengchengyao force-pushed the snapshot_count branch from 6865894 to 9af109a Compare April 25, 2018 03:14

dillaman added needs-qa wip-jason-testing and removed needs-qa wip-jason-testing labels Apr 25, 2018

zhengchengyao force-pushed the snapshot_count branch from 9af109a to 5e83440 Compare April 27, 2018 15:02

rbd/info: add snapshot count in rbd info

5e83440

Signed-off-by: Zheng Yin <zhengyin@huayun.com>

dillaman added needs-qa wip-jason-testing labels May 3, 2018

dillaman removed needs-qa wip-jason-testing labels May 10, 2018

dillaman closed this May 10, 2018

dillaman pushed a commit that referenced this pull request May 10, 2018

Merge pull request #21292 from zy751713126/snapshot_count

ce7afd4

rbd: add snapshot count in rbd info Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

rbd: add snapshot count in rbd info #21292

rbd: add snapshot count in rbd info #21292

zhengchengyao commented Apr 9, 2018

zhengchengyao commented Apr 9, 2018

dillaman left a comment

dillaman Apr 9, 2018

dillaman left a comment

dillaman commented Apr 9, 2018

zhengchengyao commented Apr 10, 2018

dillaman commented Apr 10, 2018

zhengchengyao commented Apr 17, 2018

dillaman commented Apr 17, 2018

dillaman Apr 20, 2018

dillaman Apr 20, 2018

dillaman Apr 20, 2018

zhengchengyao commented Apr 25, 2018 •

edited

dillaman commented Apr 27, 2018

zhengchengyao commented May 3, 2018

dillaman commented May 10, 2018

zhengchengyao commented May 10, 2018

dillaman commented May 10, 2018

dillaman commented May 10, 2018

zhengchengyao commented May 11, 2018

rbd: add snapshot count in rbd info #21292

rbd: add snapshot count in rbd info #21292

Conversation

zhengchengyao commented Apr 9, 2018

zhengchengyao commented Apr 9, 2018

dillaman left a comment

Choose a reason for hiding this comment

dillaman Apr 9, 2018

Choose a reason for hiding this comment

dillaman left a comment

Choose a reason for hiding this comment

dillaman commented Apr 9, 2018

zhengchengyao commented Apr 10, 2018

dillaman commented Apr 10, 2018

zhengchengyao commented Apr 17, 2018

dillaman commented Apr 17, 2018

dillaman Apr 20, 2018

Choose a reason for hiding this comment

dillaman Apr 20, 2018

Choose a reason for hiding this comment

dillaman Apr 20, 2018

Choose a reason for hiding this comment

zhengchengyao commented Apr 25, 2018 • edited

dillaman commented Apr 27, 2018

zhengchengyao commented May 3, 2018

dillaman commented May 10, 2018

zhengchengyao commented May 10, 2018

dillaman commented May 10, 2018

dillaman commented May 10, 2018

zhengchengyao commented May 11, 2018

zhengchengyao commented Apr 25, 2018 •

edited