Merge pull request ceph#49302 from petrutlucian94/adapter_resets

rbd-wnbd: optionally handle wnbd adapter restart events

Reviewed-by: Ilya Dryomov <[email protected]>

src/common/CMakeLists.txt

@@ -173,6 +173,7 @@ elseif(AIX)
   list(APPEND common_srcs aix_errno.cc)
 elseif(WIN32)
   list(APPEND common_srcs win32/errno.cc)
+  list(APPEND common_srcs win32/wstring.cc)
 endif()
 
 if(WITH_EVENTTRACE)

src/common/win32/service.cc

@@ -69,14 +69,14 @@ void WINAPI ServiceBase::run()
   s_service->set_status(SERVICE_START_PENDING);
 
   // TODO: should we expect exceptions?
-  ldout(s_service->cct, 5) << "Starting service." << dendl;
+  ldout(s_service->cct, 0) << "Starting service." << dendl;
   int err = s_service->run_hook();
   if (err) {
     lderr(s_service->cct) << "Failed to start service. Error code: "
                           << err << dendl;
     s_service->shutdown(true);
   } else {
-    ldout(s_service->cct, 5) << "Successfully started service." << dendl;
+    ldout(s_service->cct, 0) << "Successfully started service." << dendl;
     s_service->set_status(SERVICE_RUNNING);
   }
 }
@@ -98,7 +98,7 @@ void ServiceBase::shutdown(bool ignore_errors)
       set_status(original_state);
     }
   } else {
-    dout(5) << "Shutdown hook completed." << dendl;
+    dout(0) << "Shutdown hook completed." << dendl;
     set_status(SERVICE_STOPPED);
   }
 }
@@ -113,7 +113,7 @@ void ServiceBase::stop()
     derr << "Service stop hook failed. Error code: " << err << dendl;
     set_status(original_state);
   } else {
-    dout(5) << "Successfully stopped service." << dendl;
+    dout(0) << "Successfully stopped service." << dendl;
     set_status(SERVICE_STOPPED);
   }
 }

src/common/win32/wstring.cc

@@ -0,0 +1,27 @@
+/*
+ * Ceph - scalable distributed file system
+ *
+ * Copyright (C) 2022 Cloudbase Solutions
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software
+ * Foundation.  See file COPYING.
+ *
+ */
+
+#include "wstring.h"
+
+#include <boost/locale/encoding_utf.hpp>
+
+using boost::locale::conv::utf_to_utf;
+
+std::wstring to_wstring(const std::string& str)
+{
+  return utf_to_utf<wchar_t>(str.c_str(), str.c_str() + str.size());
+}
+
+std::string to_string(const std::wstring& str)
+{
+  return utf_to_utf<char>(str.c_str(), str.c_str() + str.size());
+}

src/common/win32/wstring.h

@@ -0,0 +1,18 @@
+/*
+ * Ceph - scalable distributed file system
+ *
+ * Copyright (C) 2022 Cloudbase Solutions
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software
+ * Foundation.  See file COPYING.
+ *
+ */
+
+#pragma once
+
+#include <string>
+
+std::wstring to_wstring(const std::string& str);
+std::string to_string(const std::wstring& wstr);

src/dokan/ceph_dokan.cc

@@ -35,6 +35,7 @@
 #include "common/dout.h"
 #include "common/errno.h"
 #include "common/version.h"
+#include "common/win32/wstring.h"
 
 #include "global/global_init.h"
 

src/dokan/options.cc

@@ -17,6 +17,7 @@
 
 #include "common/ceph_argparse.h"
 #include "common/config.h"
+#include "common/win32/wstring.h"
 
 #include "global/global_init.h"
 

src/dokan/utils.cc

@@ -12,20 +12,6 @@
 
 #include "utils.h"
 
-#include <boost/locale/encoding_utf.hpp>
-
-using boost::locale::conv::utf_to_utf;
-
-std::wstring to_wstring(const std::string& str)
-{
-  return utf_to_utf<wchar_t>(str.c_str(), str.c_str() + str.size());
-}
-
-std::string to_string(const std::wstring& str)
-{
-  return utf_to_utf<char>(str.c_str(), str.c_str() + str.size());
-}
-
 void to_filetime(time_t t, LPFILETIME pft)
 {
   // Note that LONGLONG is a 64-bit value

src/dokan/utils.h

@@ -10,10 +10,9 @@
  *
 */
 
-#include "include/compat.h"
+#pragma once
 
-std::wstring to_wstring(const std::string& str);
-std::string to_string(const std::wstring& str);
+#include "include/compat.h"
 
 void to_filetime(time_t t, LPFILETIME pft);
 void to_unix_time(FILETIME ft, time_t *t);

src/include/win32/fs_compat.h

@@ -13,6 +13,8 @@
 // Those definitions allow handling information coming from Ceph and should
 // not be passed to Windows functions.
 
+#pragma once
+
 #define S_IFLNK   0120000
 
 #define S_ISTYPE(m, TYPE) ((m & S_IFMT) == TYPE)

src/tools/rbd_wnbd/CMakeLists.txt

@@ -1,9 +1,10 @@
-add_executable(rbd-wnbd wnbd_handler.cc rbd_wnbd.cc)
+add_executable(rbd-wnbd rbd_wnbd.cc wnbd_handler.cc wnbd_wmi.cc)
 set_target_properties(
     rbd-wnbd PROPERTIES COMPILE_FLAGS
     "-fpermissive -I${WNBD_INCLUDE_DIRS}")
 target_link_libraries(
     rbd-wnbd setupapi rpcrt4
+    wbemuuid oleaut32
     ${WNBD_LIBRARIES}
     ${Boost_FILESYSTEM_LIBRARY}
     librbd librados global)