]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephfs-mirror: silence warnings when connecting via mon host 41947/head
authorVenky Shankar <vshankar@redhat.com>
Mon, 14 Jun 2021 07:09:37 +0000 (03:09 -0400)
committerVenky Shankar <vshankar@redhat.com>
Mon, 21 Jun 2021 04:43:55 +0000 (00:43 -0400)
When connecting to remote cluster via mon address, the cluster
confuration file is not required. However, the mirror daemon
fills up the ceph context with the cluster name resulting in
the following warning in (systemctl) logs:

    auth: unable to find a keyring on ...

These warning messages need to be silence as they can mislead
the user.

Fixes: http://tracker.ceph.com/issues/51204
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 98a8980e863814fd1d303e062e863b54ca3184f9)

src/tools/cephfs_mirror/Utils.cc

index aafafbff93727173c3bbcd109edd9d7683561ad0..1a8b8e0acf393a5543336463d19eb0192c318885 100644 (file)
@@ -31,7 +31,9 @@ int connect(std::string_view client_name, std::string_view cluster_name,
 
   CephContext *cct = common_preinit(iparams, CODE_ENVIRONMENT_LIBRARY,
                                     CINIT_FLAG_UNPRIVILEGED_DAEMON_DEFAULTS);
-  cct->_conf->cluster = cluster_name;
+  if (mon_host.empty()) {
+    cct->_conf->cluster = cluster_name;
+  }
 
   int r = cct->_conf.parse_config_files(nullptr, nullptr, 0);
   if (r < 0 && r != -ENOENT) {