From: PCzhangPC <pengcheng.zhang@easystack.cn>
Date: Fri, 15 Sep 2017 06:24:26 +0000 (+0800)
Subject: rbd:update some documents of rbd bench
X-Git-Tag: v13.0.1~694^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7ec29ac6dbdbccb0061b44dc585b918ef282036e;p=ceph.git

rbd:update some documents of rbd bench

Signed-off-by: PCzhangPC <pengcheng.zhang@easystack.cn>
---

diff --git a/doc/man/8/rbd.rst b/doc/man/8/rbd.rst
index c37ca447498..2e68ea02de6 100644
--- a/doc/man/8/rbd.rst
+++ b/doc/man/8/rbd.rst
@@ -377,11 +377,11 @@ Commands
   Release a lock on an image. The lock id and locker are
   as output by lock ls.
 
-:command:`bench` --io-type <read | write> [--io-size *size-in-B/K/M/G/T*] [--io-threads *num-ios-in-flight*] [--io-total *size-in-B/K/M/G/T*] [--io-pattern seq | rand] *image-spec*
+:command:`bench` --io-type <read | write | readwrite | rw> [--io-size *size-in-B/K/M/G/T*] [--io-threads *num-ios-in-flight*] [--io-total *size-in-B/K/M/G/T*] [--io-pattern seq | rand] [--rw-mix-read *read proportion in readwrite*] *image-spec*
   Generate a series of IOs to the image and measure the IO throughput and
   latency.  If no suffix is given, unit B is assumed for both --io-size and
   --io-total.  Defaults are: --io-size 4096, --io-threads 16, --io-total 1G,
-  --io-pattern seq.
+  --io-pattern seq, --rw-mix-read 50.
 
 :command:`trash ls` [*pool-name*]
   List all entries from trash.
diff --git a/src/test/cli/rbd/help.t b/src/test/cli/rbd/help.t
index c9b9e043c7d..eed9aab9e73 100644
--- a/src/test/cli/rbd/help.t
+++ b/src/test/cli/rbd/help.t
@@ -123,7 +123,8 @@ Skip test on FreeBSD as it generates different output there.
   rbd help bench
   usage: rbd bench [--pool <pool>] [--image <image>] [--io-size <io-size>] 
                    [--io-threads <io-threads>] [--io-total <io-total>] 
-                   [--io-pattern <io-pattern>] --io-type <io-type> 
+                   [--io-pattern <io-pattern>] 
+                   [--rw-mix-read <rw-mix-read>] --io-type <io-type> 
                    <image-spec> 
   
   Simple benchmark.
@@ -139,7 +140,8 @@ Skip test on FreeBSD as it generates different output there.
     --io-threads arg     ios in flight [default: 16]
     --io-total arg       total size for IO (in B/K/M/G/T) [default: 1G]
     --io-pattern arg     IO pattern (rand or seq) [default: seq]
-    --io-type arg        IO type (read or write)
+    --rw-mix-read arg    read proportion in readwrite (<= 100) [default: 50]
+    --io-type arg        IO type (read , write, or readwrite(rw))
   
   rbd help children
   usage: rbd children [--pool <pool>] [--image <image>] [--snap <snap>]