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 <[email protected]>

Author: idryomov

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;

src/librbd/migration/HttpClient.cc

@@ -283,7 +283,7 @@ class HttpClient<I>::HttpSession : public HttpSessionInterface {
     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 @@ class HttpClient<I>::HttpSession : public HttpSessionInterface {
     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;
     }
 

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;

src/librbd/migration/QCOWFormat.cc

@@ -844,8 +844,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;
   }

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;
   }

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;
   }