]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: restart non-ceph daemons on reconfig
authorSage Weil <sage@redhat.com>
Tue, 17 Dec 2019 15:51:06 +0000 (09:51 -0600)
committerSage Weil <sage@redhat.com>
Sun, 22 Dec 2019 17:00:33 +0000 (11:00 -0600)
Signed-off-by: Sage Weil <sage@redhat.com>
src/cephadm/cephadm

index fabcaf02b00930dc05a106606dd3854a802dd6a6..2139b0af4ce345fbd6076d3304be7d333858a1c8 100755 (executable)
@@ -977,11 +977,19 @@ def deploy_daemon(fsid, daemon_type, daemon_id, c, uid, gid,
             fsid, daemon_type, daemon_id,
             uid, gid,
             config, keyring)
+
     if not reconfig:
         deploy_daemon_units(fsid, uid, gid, daemon_type, daemon_id, c,
                             osd_fsid=osd_fsid)
+
     update_firewalld(daemon_type)
 
+    if reconfig and daemon_type not in Ceph.daemons:
+        # ceph daemons do not need a restart; others (presumably) do to pick
+        # up the new config
+        call_throws(['systemctl', 'restart',
+                     get_unit_name(fsid, daemon_type, daemon_id)])
+
 def deploy_daemon_units(fsid, uid, gid, daemon_type, daemon_id, c,
                         enable=True, start=True,
                         osd_fsid=None):