From: John Spray <john.spray@redhat.com>
Date: Mon, 8 Aug 2016 16:09:12 +0000 (+0100)
Subject: mgr: skip past broken modules and load the rest
X-Git-Tag: v11.0.1~60^2~20
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fc3090fcddd854b47a08698b3e57a6f7cfb82d4a;p=ceph.git

mgr: skip past broken modules and load the rest

...instead of stopping at the first python module
that fails to load.

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

diff --git a/src/mgr/PyModules.cc b/src/mgr/PyModules.cc
index 8c1fe867b02b..4fba53c52c6e 100644
--- a/src/mgr/PyModules.cc
+++ b/src/mgr/PyModules.cc
@@ -330,8 +330,7 @@ int PyModules::init()
       derr << "Error loading module '" << *module_name << "': "
         << cpp_strerror(r) << dendl;
       derr << handle_pyerror() << dendl;
-
-      return r;
+      // Don't drop out here, load the other modules
     } else {
       // Success!
       modules[*module_name] = mod;