From 3c2c90a72df3eb9382f37d2e2e3e911c6148eba5 Mon Sep 17 00:00:00 2001 From: sageweil Date: Mon, 27 Aug 2007 15:01:18 +0000 Subject: [PATCH] small cleanups git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1705 29311d96-e01e-0410-9327-a35deaab8ce9 --- trunk/ceph/cfuse.cc | 4 ++-- trunk/ceph/client/fuse_ll.cc | 2 +- trunk/ceph/mds/CDir.cc | 2 ++ trunk/ceph/mds/CDir.h | 4 +++- trunk/ceph/mds/MDBalancer.cc | 2 +- trunk/ceph/msg/SimpleMessenger.cc | 2 +- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/trunk/ceph/cfuse.cc b/trunk/ceph/cfuse.cc index 7be2b9d772c3c..3c157fefadf89 100644 --- a/trunk/ceph/cfuse.cc +++ b/trunk/ceph/cfuse.cc @@ -67,12 +67,12 @@ int main(int argc, char **argv, char *envp[]) { cout << "mounting" << std::endl; client->mount(); - cerr << "starting fuse on pid " << getpid() << std::endl; + //cerr << "starting fuse on pid " << getpid() << std::endl; if (g_conf.fuse_ll) ceph_fuse_ll_main(client, argc, argv); else ceph_fuse_main(client, argc, argv); - cerr << "fuse finished on pid " << getpid() << std::endl; + //cerr << "fuse finished on pid " << getpid() << std::endl; client->unmount(); cout << "unmounted" << std::endl; diff --git a/trunk/ceph/client/fuse_ll.cc b/trunk/ceph/client/fuse_ll.cc index 7dee7936746f0..f1f92b0cd01b3 100644 --- a/trunk/ceph/client/fuse_ll.cc +++ b/trunk/ceph/client/fuse_ll.cc @@ -350,7 +350,7 @@ static struct fuse_lowlevel_ops ceph_ll_oper = { int ceph_fuse_ll_main(Client *c, int argc, char *argv[]) { - cout << "ceph_fuse_ll_main starting fuse" << std::endl; + cout << "ceph_fuse_ll_main starting fuse on pid " << getpid() << std::endl; client = c; diff --git a/trunk/ceph/mds/CDir.cc b/trunk/ceph/mds/CDir.cc index 4a7abebecf26f..895e419bd040e 100644 --- a/trunk/ceph/mds/CDir.cc +++ b/trunk/ceph/mds/CDir.cc @@ -1223,6 +1223,7 @@ pair CDir::authority() * * note that this DOES heed dir_auth.pending */ +/* bool CDir::is_subtree_root() { if (dir_auth == CDIR_AUTH_DEFAULT) { @@ -1235,6 +1236,7 @@ bool CDir::is_subtree_root() return true; } } +*/ /** contains(x) * true if we are x, or an ancestor of x diff --git a/trunk/ceph/mds/CDir.h b/trunk/ceph/mds/CDir.h index 20686cab02c07..3857dbb334557 100644 --- a/trunk/ceph/mds/CDir.h +++ b/trunk/ceph/mds/CDir.h @@ -291,7 +291,9 @@ private: return !is_auth() && !is_ambiguous_dir_auth(); } - bool is_subtree_root(); + bool is_subtree_root() { + return dir_auth != CDIR_AUTH_DEFAULT; + } bool contains(CDir *x); // true if we are x or an ancestor of x diff --git a/trunk/ceph/mds/MDBalancer.cc b/trunk/ceph/mds/MDBalancer.cc index a1515928aee09..e830ad6d199ad 100644 --- a/trunk/ceph/mds/MDBalancer.cc +++ b/trunk/ceph/mds/MDBalancer.cc @@ -165,7 +165,7 @@ void MDBalancer::send_heartbeat() mds_import_map[ mds->get_nodeid() ] = import_map; - dout(5) << "mds" << mds->get_nodeid() << " sending heartbeat " << beat_epoch << " " << load << dendl; + dout(5) << "mds" << mds->get_nodeid() << " epoch " << beat_epoch << " load " << load << dendl; for (map::iterator it = import_map.begin(); it != import_map.end(); it++) { diff --git a/trunk/ceph/msg/SimpleMessenger.cc b/trunk/ceph/msg/SimpleMessenger.cc index 6e09978e2cbc0..16cf9c5b983df 100644 --- a/trunk/ceph/msg/SimpleMessenger.cc +++ b/trunk/ceph/msg/SimpleMessenger.cc @@ -129,7 +129,7 @@ int Rank::Accepter::start() socklen_t llen = sizeof(listen_addr); getsockname(listen_sd, (sockaddr*)&listen_addr, &llen); - dout(-10) << "accepter.start bound to " << listen_addr << dendl; + dout(10) << "accepter.start bound to " << listen_addr << dendl; // listen! rc = ::listen(listen_sd, 1000); -- 2.39.5