From ca17e360ea6b5767a07e732e0cedae4f6b46ac0f Mon Sep 17 00:00:00 2001
From: Lucian Petrut <lpetrut@cloudbasesolutions.com>
Date: Wed, 7 Dec 2022 15:18:48 +0200
Subject: [PATCH] common, rbd-wnbd: bump Windows log level

We're increasing the log level for certain Windows operational log
messages.

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
(cherry picked from commit 3d8afc00215146fbc0226c2c6ccc7cb5dd3a2bb5)
---
 src/common/win32/service.cc    |  8 ++++----
 src/tools/rbd_wnbd/rbd_wnbd.cc | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/common/win32/service.cc b/src/common/win32/service.cc
index 846c5d09dfaa8..7cf7620bf87bc 100644
--- a/src/common/win32/service.cc
+++ b/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);
   }
 }
diff --git a/src/tools/rbd_wnbd/rbd_wnbd.cc b/src/tools/rbd_wnbd/rbd_wnbd.cc
index 5188f5ae292f4..0671844d10412 100644
--- a/src/tools/rbd_wnbd/rbd_wnbd.cc
+++ b/src/tools/rbd_wnbd/rbd_wnbd.cc
@@ -483,7 +483,7 @@ int map_device_using_suprocess(std::string arguments, int timeout_ms)
     } else {
       // The process closed the pipe without notifying us or exiting.
       // This is quite unlikely, but we'll terminate the process.
-      dout(5) << "Terminating unresponsive process." << dendl;
+      dout(0) << "Terminating unresponsive process." << dendl;
       TerminateProcess(pi.hProcess, 1);
       exit_code = -EINVAL;
     }
@@ -502,7 +502,7 @@ int map_device_using_suprocess(std::string arguments, int timeout_ms)
 
 BOOL WINAPI console_handler_routine(DWORD dwCtrlType)
 {
-  dout(5) << "Received control signal: " << dwCtrlType
+  dout(0) << "Received control signal: " << dwCtrlType
           << ". Exiting." << dendl;
 
   std::unique_lock l{shutdown_lock};
@@ -606,12 +606,12 @@ int restart_registered_mappings(
       continue;
     }
     if (cfg.wnbd_mapped) {
-      dout(5) << __func__ << ": device already mapped: "
+      dout(1) << __func__ << ": device already mapped: "
               << cfg.devpath << dendl;
       continue;
     }
     if (!cfg.persistent) {
-      dout(5) << __func__ << ": cleaning up non-persistent mapping: "
+      dout(1) << __func__ << ": cleaning up non-persistent mapping: "
               << cfg.devpath << dendl;
       r = remove_config_from_registry(&cfg);
       if (r) {
@@ -640,7 +640,7 @@ int restart_registered_mappings(
           return;
         }
 
-        dout(5) << "Remapping: " << cfg.devpath
+        dout(1) << "Remapping: " << cfg.devpath
                 << ". Timeout: " << time_left_ms << " ms." << dendl;
 
         // We'll try to map all devices and return a non-zero value
@@ -651,7 +651,7 @@ int restart_registered_mappings(
           derr << "Could not create mapping: "
                << cfg.devpath << ". Error: " << r << dendl;
         } else {
-          dout(5) << "Successfully remapped: " << cfg.devpath << dendl;
+          dout(1) << "Successfully remapped: " << cfg.devpath << dendl;
         }
       });
   }
@@ -704,7 +704,7 @@ int disconnect_all_mappings(
         cfg.hard_disconnect_fallback = true;
         cfg.soft_disconnect_timeout = time_left_ms / 1000;
 
-        dout(5) << "Removing mapping: " << cfg.devpath
+        dout(1) << "Removing mapping: " << cfg.devpath
                 << ". Timeout: " << cfg.soft_disconnect_timeout
                 << "s. Hard disconnect: " << cfg.hard_disconnect
                 << dendl;
@@ -715,7 +715,7 @@ int disconnect_all_mappings(
           derr << "Could not remove mapping: " << cfg.devpath
                << ". Error: " << r << dendl;
         } else {
-          dout(5) << "Successfully removed mapping: " << cfg.devpath << dendl;
+          dout(1) << "Successfully removed mapping: " << cfg.devpath << dendl;
         }
       });
   }
@@ -774,14 +774,14 @@ class RBDService : public ServiceBase {
     {
       switch(request->command) {
         case Connect:
-          dout(5) << "Received device connect request. Command line: "
+          dout(1) << "Received device connect request. Command line: "
                   << (char*)request->arguments << dendl;
           // TODO: use the configured service map timeout.
           // TODO: add ceph.conf options.
           return map_device_using_suprocess(
             (char*)request->arguments, DEFAULT_MAP_TIMEOUT_MS);
         default:
-          dout(5) << "Received unsupported command: "
+          dout(1) << "Received unsupported command: "
                   << request->command << dendl;
           return -ENOSYS;
       }
-- 
2.39.5