From: John Spray <john.spray@redhat.com>
Date: Wed, 11 Apr 2018 12:45:53 +0000 (-0400)
Subject: mgr: clean up ActivePyModules logging
X-Git-Tag: v13.1.0~143^2~14
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6e447fd101557bdc5b72fbbebf1d7da9c6526d8b;p=ceph-ci.git

mgr: clean up ActivePyModules logging

This was running the prefix and message together.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/mgr/ActivePyModules.cc b/src/mgr/ActivePyModules.cc
index ff4bd2d3ce0..e61030ab686 100644
--- a/src/mgr/ActivePyModules.cc
+++ b/src/mgr/ActivePyModules.cc
@@ -431,7 +431,7 @@ bool ActivePyModules::get_store(const std::string &module_name,
   const std::string global_key = PyModule::config_prefix
     + module_name + "/" + key;
 
-  dout(4) << __func__ << "key: " << global_key << dendl;
+  dout(4) << __func__ << " key: " << global_key << dendl;
 
   if (store_cache.count(global_key)) {
     *val = store_cache.at(global_key);
@@ -453,7 +453,6 @@ bool ActivePyModules::get_config(const std::string &module_name,
 
   dout(4) << __func__ << " key: " << global_key << dendl;
 
-  
   Mutex::Locker lock(module_config.lock);
   
   if (module_config.config.count(global_key)) {
diff --git a/src/mgr/PyModuleRegistry.cc b/src/mgr/PyModuleRegistry.cc
index 0537a614a33..f66f0a2feb9 100644
--- a/src/mgr/PyModuleRegistry.cc
+++ b/src/mgr/PyModuleRegistry.cc
@@ -389,6 +389,7 @@ void PyModuleRegistry::handle_config(const std::string &k, const std::string &v)
   Mutex::Locker l(module_config.lock);
 
   if (!v.empty()) {
+    dout(4) << "Loaded module_config entry " << k << ":" << v << dendl;
     module_config.config[k] = v;
   } else {
     module_config.config.erase(k);
@@ -402,6 +403,7 @@ void PyModuleRegistry::upgrade_config(
   // Only bother doing anything if we didn't already have
   // some new-style config.
   if (module_config.config.empty()) {
+    dout(1) << "Upgrading module configuration for Mimic" << dendl;
     // Upgrade luminous->mimic: migrate config-key configuration
     // into main configuration store
     for(auto &i : old_config) {
@@ -409,6 +411,8 @@ void PyModuleRegistry::upgrade_config(
       const std::string module_name = i.first.substr(4, i.first.substr(4).find('/'));
       const std::string key = i.first.substr(last_slash + 1);
       module_config.set_config(monc, module_name, key, i.second);
+      dout(4) << "Rewrote configuration module:key "
+              << module_name << ":" << key << dendl;
     }
   } else {
     dout(10) << "Module configuration contains "