update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / doc / man / 8 / osdmaptool.rst

diff --git a/ceph/doc/man/8/osdmaptool.rst b/ceph/doc/man/8/osdmaptool.rst
index 131e981fac7d07b052b402f5162a6f8052d125b0..92ad8039cc2082d80d210a43ff3ace07feae0e13 100644 (file)
--- a/ceph/doc/man/8/osdmaptool.rst
+++ b/ceph/doc/man/8/osdmaptool.rst
@@ -17,8 +17,8 @@ Synopsis
 | **osdmaptool** *mapfilename* [--export-crush *crushmap*]
 | **osdmaptool** *mapfilename* [--upmap *file*] [--upmap-max *max-optimizations*]
   [--upmap-deviation *max-deviation*] [--upmap-pool *poolname*]
-  [--upmap-save *file*] [--upmap-save *newosdmap*] [--upmap-active]
-| **osdmaptool** *mapfilename* [--upmap-cleanup] [--upmap-save *newosdmap*]
+  [--save] [--upmap-active]
+| **osdmaptool** *mapfilename* [--upmap-cleanup] [--upmap *file*]
 
 
 Description
@@ -123,6 +123,14 @@ Options
 
    mark an osd as out (but do not persist)
 
+.. option:: --mark-up <osdid>
+
+   mark an osd as up (but do not persist)
+
+.. option:: --mark-in <osdid>
+
+   mark an osd as in (but do not persist)
+
 .. option:: --tree
 
    Displays a hierarchical tree of the map.
@@ -163,14 +171,17 @@ Options
 
    restrict upmap balancing to 1 pool or the option can be repeated for multiple pools
 
-.. option:: --upmap-save
-
-   write modified OSDMap with upmap changes
-
 .. option:: --upmap-active
 
    Act like an active balancer, keep applying changes until balanced
 
+.. option:: --adjust-crush-weight <osdid:weight>[,<osdid:weight>,<...>]
+
+   Change CRUSH weight of <osdid>
+
+.. option:: --save
+
+   write modified osdmap with upmap or crush-adjust changes
 
 Example
 =======
@@ -187,7 +198,7 @@ To view the mappings of placement groups for pool 1::
 
         osdmaptool osdmap --test-map-pgs-dump --pool 1
 
-        pool 0 pg_num 8
+        pool 1 pg_num 8
         1.0     [0,2,1] 0
         1.1     [2,0,1] 2
         1.2     [0,1,2] 0
@@ -254,7 +265,7 @@ placement group distribution, whose standard deviation is 1.41421::
         size 20
         size 364
 
-   To simulate the active balancer in upmap mode::
+To simulate the active balancer in upmap mode::
 
         osdmaptool --upmap upmaps.out --upmap-active --upmap-deviation 6 --upmap-max 11 osdmap