small cleanups

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1705 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/trunk/ceph/cfuse.cc b/trunk/ceph/cfuse.cc
index 7be2b9d772c3c88a13c5dca6bf41932ac81fb02d..3c157fefadf8977178d82d71b2bafb922685ee20 100644 (file)
--- 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 7dee7936746f015ce0c46ee06a621707e79ce712..f1f92b0cd01b3054f025daa20209685ea2400df1 100644 (file)
--- 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 4a7abebecf26f5e9f38d55ecf388c5f252240a26..895e419bd040e926a0a66e1b295a7a0c74be7981 100644 (file)
--- a/trunk/ceph/mds/CDir.cc
+++ b/trunk/ceph/mds/CDir.cc
@@ -1223,6 +1223,7 @@ pair<int,int> 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 20686cab02c0726dfb11b3243448353d85d66107..3857dbb33455759267f1c5edf05d41631fbd5bfe 100644 (file)
--- 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 a1515928aee09636083631f5170ab69aad6f1f07..e830ad6d199ad781faad007c30124e127e0127aa 100644 (file)
--- 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<int, float>::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 6e09978e2cbc0d6463936129744abbadc0325eef..16cf9c5b983dfccb7d997dc51e1ff0526c1ac7c3 100644 (file)
--- 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);