librbd/migration: massage some error messages

Add missing spaces, don't use the word stream when reporting errors
on POSIX file operations (open() and lseek64()) and fix a cut-and-paste
typo in RawSnapshot.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 789df2ce38f35ffb3e86974e02868e5fff71e72c)

diff --git a/src/librbd/migration/FileStream.cc b/src/librbd/migration/FileStream.cc
index 63cd722dd3c5217aa3b885c4cb31c1bd3160a2de..b548de7ee37ea4d836ab69d2a5321f3184ce7231 100644 (file)
--- a/src/librbd/migration/FileStream.cc
+++ b/src/librbd/migration/FileStream.cc
@@ -74,7 +74,7 @@ struct FileStream<I>::ReadRequest {
     auto offset = lseek64(file_stream->m_file_no, byte_extent.first, SEEK_SET);
     if (offset == -1) {
       r = -errno;
-      lderr(cct) << "failed to seek file stream: " << cpp_strerror(r) << dendl;
+      lderr(cct) << "failed to seek file: " << cpp_strerror(r) << dendl;
       finish(r);
       return;
     }
@@ -149,7 +149,7 @@ void FileStream<I>::open(Context* on_finish) {
   m_file_no = ::open(file_path.c_str(), O_RDONLY);
   if (m_file_no < 0) {
     int r = -errno;
-    lderr(m_cct) << "failed to open file stream '" << file_path << "': "
+    lderr(m_cct) << "failed to open file '" << file_path << "': "
                  << cpp_strerror(r) << dendl;
     on_finish->complete(r);
     return;

diff --git a/src/librbd/migration/HttpClient.cc b/src/librbd/migration/HttpClient.cc
index 90d5723ed84cb1de25983a026fe9151ceb0cb036..28e21626f6028d9a81677bf4fd383c65d550f9b5 100644 (file)
--- a/src/librbd/migration/HttpClient.cc
+++ b/src/librbd/migration/HttpClient.cc
@@ -283,7 +283,7 @@ private:
     ldout(cct, 15) << "r=" << r << dendl;
 
     if (r < 0) {
-      lderr(cct) << "failed to disconnect stream: '" << cpp_strerror(r)
+      lderr(cct) << "failed to disconnect stream: " << cpp_strerror(r)
                  << dendl;
     }
 
@@ -350,7 +350,7 @@ private:
     ldout(cct, 15) << "r=" << r << dendl;
 
     if (r < 0) {
-      lderr(cct) << "failed to disconnect stream: '" << cpp_strerror(r)
+      lderr(cct) << "failed to disconnect stream: " << cpp_strerror(r)
                  << dendl;
     }
 

diff --git a/src/librbd/migration/OpenSourceImageRequest.cc b/src/librbd/migration/OpenSourceImageRequest.cc
index 8abdedf332d9922886e15b010300acc88e8f4cac..da2aa73eceaeb32e9a667374b1e64fa859395157 100644 (file)
--- a/src/librbd/migration/OpenSourceImageRequest.cc
+++ b/src/librbd/migration/OpenSourceImageRequest.cc
@@ -72,8 +72,8 @@ void OpenSourceImageRequest<I>::open_source() {
   int r = source_spec_builder.parse_source_spec(source_spec,
                                                 &source_spec_object);
   if (r < 0) {
-    lderr(m_cct) << "failed to parse migration source-spec:" << cpp_strerror(r)
-                 << dendl;
+    lderr(m_cct) << "failed to parse migration source-spec: "
+                 << cpp_strerror(r) << dendl;
     (*m_src_image_ctx)->state->close();
     finish(r);
     return;

diff --git a/src/librbd/migration/QCOWFormat.cc b/src/librbd/migration/QCOWFormat.cc
index cedf9aa20f02c7176735b7c1a67c28c60e3ab9ea..f05c35b9728b2ab99f7f4b52c1a703e0ea526592 100644 (file)
--- a/src/librbd/migration/QCOWFormat.cc
+++ b/src/librbd/migration/QCOWFormat.cc
@@ -842,8 +842,8 @@ void QCOWFormat<I>::open(Context* on_finish) {
 
   int r = m_source_spec_builder->build_stream(m_json_object, &m_stream);
   if (r < 0) {
-    lderr(cct) << "failed to build migration stream handler" << cpp_strerror(r)
-               << dendl;
+    lderr(cct) << "failed to build migration stream handler: "
+               << cpp_strerror(r) << dendl;
     on_finish->complete(r);
     return;
   }

diff --git a/src/librbd/migration/RawSnapshot.cc b/src/librbd/migration/RawSnapshot.cc
index 4a83fd8ad97eaba11af634dbab4cfeeb71655ae7..f56d518c3e13c198b697c17ac3c34922b0972dd5 100644 (file)
--- a/src/librbd/migration/RawSnapshot.cc
+++ b/src/librbd/migration/RawSnapshot.cc
@@ -153,8 +153,8 @@ void RawSnapshot<I>::open(SnapshotInterface* previous_snapshot,
 
   int r = m_source_spec_builder->build_stream(m_json_object, &m_stream);
   if (r < 0) {
-    lderr(cct) << "failed to build migration stream handler" << cpp_strerror(r)
-               << dendl;
+    lderr(cct) << "failed to build migration stream handler: "
+               << cpp_strerror(r) << dendl;
     on_finish->complete(r);
     return;
   }

diff --git a/src/librbd/migration/SourceSpecBuilder.cc b/src/librbd/migration/SourceSpecBuilder.cc
index 214d7ce0e5d4408e596babb8f0fc44656c8717ab..b334d8769f76066292ed37eb2f6765c4d6385384 100644 (file)
--- a/src/librbd/migration/SourceSpecBuilder.cc
+++ b/src/librbd/migration/SourceSpecBuilder.cc
@@ -96,7 +96,7 @@ int SourceSpecBuilder<I>::build_snapshot(
     snapshot->reset(RawSnapshot<I>::create(m_image_ctx, source_spec_object,
                                            this, index));
   } else {
-    lderr(cct) << "unknown or unsupported format type '" << type << "'"
+    lderr(cct) << "unknown or unsupported snapshot type '" << type << "'"
                << dendl;
     return -ENOSYS;
   }