From: Sage Weil <sage@redhat.com>
Date: Fri, 28 Feb 2020 01:46:20 +0000 (-0600)
Subject: Merge PR #33488 into master
X-Git-Tag: v15.1.1~212
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=20f76b09e7c62c3f7ed76815ea66da5b496e2724;p=ceph-ci.git

Merge PR #33488 into master

* refs/pull/33488/head:
	doc/mgr/cephadm: document how to see the logs
	ceph: -W as shorthand for --watch-channel
	pybind/mgr_module: make mgr log message prefix a bit less verbose
	mgr/cephadm: silence remoto logger info messages
	mgr/cephadm: add misc info messages for major events
	mgr/cephadm: adjust logging
	mgr/cephadm: log to cluster channel by default
	pybind/mgr_module: infrastructure to allow logging to cluster log
	mgr/mgr_module: log to mgr log even when log_to_file
	mon: accept cephadm channel to 'ceph log last'
	ceph: allow watching channels aside from cluster and audit
	mon/LogMonitor: fix debug output for logmonitor output file parsing
	mgr: allow logging to any channel

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
---

20f76b09e7c62c3f7ed76815ea66da5b496e2724
diff --cc src/pybind/mgr/cephadm/module.py
index d0249913cc6,b2e791df1b8..e434527e8cf
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@@ -946,10 -930,9 +948,10 @@@ class CephadmOrchestrator(orchestrator.
  
      def serve(self):
          # type: () -> None
-         self.log.info("serve starting")
+         self.log.debug("serve starting")
          while self.run:
              self._check_hosts()
 +            self._remove_osds_bg()
  
              # refresh daemons
              self.log.debug('refreshing hosts')
@@@ -1680,15 -1667,16 +1686,16 @@@
                      args.append((name, host, force))
          if not args:
              raise OrchestratorError('Unable to find daemon(s) %s' % (names))
+         self.log.info('Remove daemons %s' % [a[0] for a in args])
          return self._remove_daemon(args)
  
 -    def remove_service(self, service_name):
 +    def remove_service(self, service_name, force=False):
          args = []
          for host, dm in self.cache.daemons.items():
              for name, d in dm.items():
                  if d.matches_service(service_name):
                      args.append(
-                         ('%s.%s' % (d.daemon_type, d.daemon_id), d.hostname, force)
 -                        (d.name(), d.hostname)
++                        (d.name(), d.hostname, force)
                      )
          if not args:
              raise OrchestratorError('Unable to find daemons in %s service' % (