From: HuangWei <huangwei.a180285@gmail.com>
Date: Sat, 25 Nov 2023 08:52:21 +0000 (+0800)
Subject: Update rbd import-diff command help message
X-Git-Tag: v19.3.0~371^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F54657%2Fhead;p=ceph.git

Update rbd import-diff command help message

Signed-off-by: HuangWei <huangwei.a180285@gmail.com>
---

diff --git a/src/test/cli/rbd/help.t b/src/test/cli/rbd/help.t
index a80c0fb491ed..2d1c901462c7 100644
--- a/src/test/cli/rbd/help.t
+++ b/src/test/cli/rbd/help.t
@@ -63,7 +63,8 @@
                                         associated.
       image-meta set                    Image metadata set key with value.
       import                            Import image from file.
-      import-diff                       Import an incremental diff.
+      import-diff                       Apply an incremental diff to image HEAD,
+                                        then create a snapshot.
       info                              Show information about image size,
                                         striping, etc.
       journal client disconnect         Flag image journal client as disconnected.
@@ -1254,7 +1255,7 @@
                          [--sparse-size <sparse-size>] [--no-progress] 
                          <path-name> <image-spec> 
   
-  Import an incremental diff.
+  Apply an incremental diff to image HEAD, then create a snapshot.
   
   Positional arguments
     <path-name>          import file (or '-' for stdin)
diff --git a/src/tools/rbd/action/Import.cc b/src/tools/rbd/action/Import.cc
index 3358c5bc6855..f6b3c4c3ccd8 100644
--- a/src/tools/rbd/action/Import.cc
+++ b/src/tools/rbd/action/Import.cc
@@ -526,8 +526,9 @@ int execute_diff(const po::variables_map &vm,
 }
 
 Shell::Action action_diff(
-  {"import-diff"}, {}, "Import an incremental diff.", "", &get_arguments_diff,
-  &execute_diff);
+  {"import-diff"}, {},
+  "Apply an incremental diff to image HEAD, then create a snapshot.", "",
+  &get_arguments_diff, &execute_diff);
 
 class C_Import : public Context {
 public: