clientN -> client.N

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 836924b883ab7d8a178bfee2242509e73a68229b..44133d9b363a352a9c9c968c6e14264c7c1af76c 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -78,7 +78,7 @@ using namespace std;
 #include "MetaRequest.h"
 
 #undef dout_prefix
-#define dout_prefix *_dout << "client" << whoami << " "
+#define dout_prefix *_dout << "client." << whoami << " "
 
 #define  tout(cct)       if (!cct->_conf->client_trace.empty()) traceout
 

diff --git a/src/client/SyntheticClient.cc b/src/client/SyntheticClient.cc
index 9184b4f42c59fe68ad88ae9553d6f7145d08f403..05eef99b9dcb6c263b54a836acd5735b95e2f742 100644 (file)
--- a/src/client/SyntheticClient.cc
+++ b/src/client/SyntheticClient.cc
@@ -38,7 +38,7 @@ using namespace std;
 
 #define DOUT_SUBSYS client
 #undef dout_prefix
-#define dout_prefix *_dout << "client" << (whoami >= 0 ? whoami:client->get_nodeid()) << " "
+#define dout_prefix *_dout << "client." << (whoami >= 0 ? whoami:client->get_nodeid()) << " "
 
 // traces
 //void trace_include(SyntheticClient *syn, Client *cl, string& prefix);

diff --git a/src/client/ldceph.cc b/src/client/ldceph.cc
index 877ba894ad5938b18dc2c1b433de20a03866182a..d8f672433c8f202fe83fa200609e516cc15dbd8e 100644 (file)
--- a/src/client/ldceph.cc
+++ b/src/client/ldceph.cc
@@ -157,7 +157,7 @@ public:
 
       fp_mount_point = mount_point;
 
-      cerr << "ldceph init: mounted on " << mount_point << " as client" << client->get_nodeid() << std::endl;
+      cerr << "ldceph init: mounted on " << mount_point << " as client." << client->get_nodeid() << std::endl;
 
       refresh_cwd();
     }

diff --git a/src/mds/CDentry.cc b/src/mds/CDentry.cc
index e1a89480241425f86c8d1d8ffc728148ad9217af..95e9eacedd7096320bf01ce2b33213cb9d6f197c 100644 (file)
--- a/src/mds/CDentry.cc
+++ b/src/mds/CDentry.cc
@@ -538,7 +538,7 @@ ClientLease *CDentry::add_client_lease(client_t c, Session *session)
   if (client_lease_map.count(c))
     l = client_lease_map[c];
   else {
-    dout(20) << "add_client_lease client" << c << " on " << lock << dendl;
+    dout(20) << "add_client_lease client." << c << " on " << lock << dendl;
     if (client_lease_map.empty())
       get(PIN_CLIENTLEASE);
     l = client_lease_map[c] = new ClientLease(c, this);
@@ -556,7 +556,7 @@ void CDentry::remove_client_lease(ClientLease *l, Locker *locker)
 
   bool gather = false;
 
-  dout(20) << "remove_client_lease client" << l->client << " on " << lock << dendl;
+  dout(20) << "remove_client_lease client." << l->client << " on " << lock << dendl;
   lock.put_client_lease();
   if (lock.get_num_client_lease() == 0 && !lock.is_stable())
     gather = true;

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index 90cd06ea72e08a8ba1fd03e02a8960cc045a138c..e14b7e1217149784c0cd0d20e2242b0cae952bb6 100644 (file)
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -247,7 +247,7 @@ void CInode::print(ostream& out)
 
 void CInode::add_need_snapflush(CInode *snapin, snapid_t snapid, client_t client)
 {
-  dout(10) << "add_need_snapflush client" << client << " snapid " << snapid << " on " << snapin << dendl;
+  dout(10) << "add_need_snapflush client." << client << " snapid " << snapid << " on " << snapin << dendl;
 
   if (client_need_snapflush.empty()) {
     get(CInode::PIN_NEEDSNAPFLUSH);
@@ -266,7 +266,7 @@ void CInode::add_need_snapflush(CInode *snapin, snapid_t snapid, client_t client
 
 void CInode::remove_need_snapflush(CInode *snapin, snapid_t snapid, client_t client)
 {
-  dout(10) << "remove_need_snapflush client" << client << " snapid " << snapid << " on " << snapin << dendl;
+  dout(10) << "remove_need_snapflush client." << client << " snapid " << snapid << " on " << snapin << dendl;
   set<client_t>& clients = client_need_snapflush[snapid];
   clients.erase(client);
   if (clients.empty()) {

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index 797d48c9529e4d62ca89c184f173265e45f70722..3b9fbdca19a075f94e75f33e042085d3b371ceb9 100644 (file)
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -770,11 +770,11 @@ bool Locker::eval(CInode *in, int mask)
   if (in->is_auth() && in->is_head()) {
     if (in->choose_ideal_loner() >= 0) {
       if (in->try_set_loner()) {
-       dout(10) << "eval set loner to client" << in->get_loner() << dendl;
+       dout(10) << "eval set loner to client." << in->get_loner() << dendl;
        need_issue = true;
        mask = -1;
       } else
-       dout(10) << "eval want loner client" << in->get_wanted_loner() << " but failed to set it" << dendl;
+       dout(10) << "eval want loner client." << in->get_wanted_loner() << " but failed to set it" << dendl;
     } else
       dout(10) << "eval doesn't want loner" << dendl;
   }
@@ -1636,7 +1636,7 @@ bool Locker::issue_caps(CInode *in, Capability *only_cap)
 
   client_t loner = in->get_loner();
   if (loner >= 0) {
-    dout(7) << "issue_caps loner client" << loner
+    dout(7) << "issue_caps loner client." << loner
            << " allowed=" << ccap_string(loner_allowed) 
            << ", xlocker allowed=" << ccap_string(xlocker_allowed)
            << ", others allowed=" << ccap_string(all_allowed)
@@ -1676,7 +1676,7 @@ bool Locker::issue_caps(CInode *in, Capability *only_cap)
     int pending = cap->pending();
     int wanted = cap->wanted();
 
-    dout(20) << " client" << it->first
+    dout(20) << " client." << it->first
             << " pending " << ccap_string(pending) 
             << " allowed " << ccap_string(allowed) 
             << " wanted " << ccap_string(wanted)
@@ -1684,7 +1684,7 @@ bool Locker::issue_caps(CInode *in, Capability *only_cap)
 
     // skip if suppress, and not revocation
     if (cap->is_suppress() && !(pending & ~allowed)) {
-      dout(20) << "  suppressed and !revoke, skipping client" << it->first << dendl;
+      dout(20) << "  suppressed and !revoke, skipping client." << it->first << dendl;
       continue;
     }
 
@@ -1706,7 +1706,7 @@ bool Locker::issue_caps(CInode *in, Capability *only_cap)
       int after = cap->pending();
 
       if (seq > 0) {
-        dout(7) << "   sending MClientCaps to client" << it->first
+        dout(7) << "   sending MClientCaps to client." << it->first
                << " seq " << cap->get_last_seq()
                << " new pending " << ccap_string(after) << " was " << ccap_string(before) 
                << dendl;
@@ -2052,7 +2052,7 @@ void Locker::share_inode_max_size(CInode *in)
     if (cap->is_suppress())
       continue;
     if (cap->pending() & (CEPH_CAP_FILE_WR|CEPH_CAP_FILE_BUFFER)) {
-      dout(10) << "share_inode_max_size with client" << client << dendl;
+      dout(10) << "share_inode_max_size with client." << client << dendl;
       MClientCaps *m = new MClientCaps(CEPH_CAP_OP_GRANT,
                                       in->ino(),
                                       in->find_snaprealm()->inode->ino(),
@@ -2110,7 +2110,7 @@ void Locker::adjust_cap_wanted(Capability *cap, int wanted, int issue_seq)
 
 void Locker::_do_null_snapflush(CInode *head_in, client_t client, snapid_t follows)
 {
-  dout(10) << "_do_null_snapflish client" << client << " follows " << follows << " on " << *head_in << dendl;
+  dout(10) << "_do_null_snapflish client." << client << " follows " << follows << " on " << *head_in << dendl;
   map<snapid_t, set<client_t> >::iterator p = head_in->client_need_snapflush.begin();
   while (p != head_in->client_need_snapflush.end()) {
     snapid_t snapid = p->first;
@@ -2121,7 +2121,7 @@ void Locker::_do_null_snapflush(CInode *head_in, client_t client, snapid_t follo
     if (follows > snapid)
       break;
     if (clients.count(client)) {
-      dout(10) << " doing async NULL snapflush on " << snapid << " from client" << client << dendl;
+      dout(10) << " doing async NULL snapflush on " << snapid << " from client." << client << dendl;
       CInode *sin = mdcache->get_inode(head_in->ino(), snapid);
       if (!sin) {
        // hrm, look forward until we find the inode. 
@@ -2204,7 +2204,7 @@ void Locker::handle_client_caps(MClientCaps *m)
   if (!cap && in != head_in)
     cap = head_in->get_client_cap(client);
   if (!cap) {
-    dout(7) << "handle_client_caps no cap for client" << client << " on " << *in << dendl;
+    dout(7) << "handle_client_caps no cap for client." << client << " on " << *in << dendl;
     m->put();
     return;
   }  
@@ -2240,7 +2240,7 @@ void Locker::handle_client_caps(MClientCaps *m)
        (head_in->client_need_snapflush.count(snap) &&
         head_in->client_need_snapflush[snap].count(client))) {
       dout(7) << " flushsnap snap " << snap
-             << " client" << client << " on " << *in << dendl;
+             << " client." << client << " on " << *in << dendl;
 
       // this cap now follows a later snap (i.e. the one initiating this flush, or later)
       cap->client_follows = MAX(follows, in->first) + 1;
@@ -2261,7 +2261,7 @@ void Locker::handle_client_caps(MClientCaps *m)
        head_in->remove_need_snapflush(in, snap, client);
       
     } else
-      dout(7) << " not expecting flushsnap " << snap << " from client" << client << " on " << *in << dendl;
+      dout(7) << " not expecting flushsnap " << snap << " from client." << client << " on " << *in << dendl;
     goto out;
   }
 
@@ -2304,7 +2304,7 @@ void Locker::handle_client_caps(MClientCaps *m)
     }
     
     if (m->get_dirty() && in->is_auth()) {
-      dout(7) << " flush client" << client << " dirty " << ccap_string(m->get_dirty()) 
+      dout(7) << " flush client." << client << " dirty " << ccap_string(m->get_dirty()) 
              << " seq " << m->get_seq() << " on " << *in << dendl;
       ack = new MClientCaps(CEPH_CAP_OP_FLUSH_ACK, in->ino(), 0, cap->get_cap_id(), m->get_seq(),
                            m->get_caps(), 0, m->get_dirty(), 0);
@@ -2387,7 +2387,7 @@ void Locker::process_request_cap_release(MDRequest *mdr, client_t client, const
          dn->remove_client_lease(l, this);
        }
       } else {
-       mds->clog.warn() << "client" << client << " released lease on dn "
+       mds->clog.warn() << "client." << client << " released lease on dn "
            << dir->dirfrag() << "/" << dname << " which dne\n";
      }
     }
@@ -2397,7 +2397,7 @@ void Locker::process_request_cap_release(MDRequest *mdr, client_t client, const
   if (!cap)
     return;
 
-  dout(10) << "process_cap_update client" << client << " " << ccap_string(caps) << " on " << *in
+  dout(10) << "process_cap_update client." << client << " " << ccap_string(caps) << " on " << *in
           << (mdr ? "" : " (DEFERRED, no mdr)")
           << dendl;
     
@@ -2870,7 +2870,7 @@ void Locker::handle_client_lease(MClientLease *m)
   // replica and lock
   ClientLease *l = dn->get_client_lease(client);
   if (!l) {
-    dout(7) << "handle_client_lease didn't have lease for client" << client << " of " << *dn << dendl;
+    dout(7) << "handle_client_lease didn't have lease for client." << client << " of " << *dn << dendl;
     m->put();
     return;
   } 
@@ -2881,7 +2881,7 @@ void Locker::handle_client_lease(MClientLease *m)
     if (l->seq != m->get_seq()) {
       dout(7) << "handle_client_lease release - seq " << l->seq << " != provided " << m->get_seq() << dendl;
     } else {
-      dout(7) << "handle_client_lease client" << client
+      dout(7) << "handle_client_lease client." << client
              << " on " << *dn << dendl;
       dn->remove_client_lease(l, this);
     }
@@ -2890,7 +2890,7 @@ void Locker::handle_client_lease(MClientLease *m)
 
   case CEPH_MDS_LEASE_RENEW:
     {
-      dout(7) << "handle_client_lease client" << client
+      dout(7) << "handle_client_lease client." << client
              << " renew on " << *dn << dendl;
       int pool = 1;   // fixme.. do something smart!
       m->h.duration_ms = (int)(1000 * mdcache->client_lease_durations[pool]);

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 4d86eb44a8d23defdb82f049fc22035c0640ee0b..51cdabf67d0fbeb21640710b28c5d875e264c397 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -1450,7 +1450,7 @@ CInode *MDCache::cow_inode(CInode *in, snapid_t last)
          oldin->auth_pin(lock);
          lock->set_state(LOCK_SNAP_SYNC);  // gathering
          lock->get_wrlock(true);
-         dout(10) << " client" << client << " cap " << ccap_string(issued & cinode_lock_info[i].wr_caps)
+         dout(10) << " client." << client << " cap " << ccap_string(issued & cinode_lock_info[i].wr_caps)
                   << " wrlock lock " << *lock << " on " << *oldin << dendl;
        }
       }
@@ -1464,7 +1464,7 @@ CInode *MDCache::cow_inode(CInode *in, snapid_t last)
        in->add_need_snapflush(oldin, *q, client);
       }
     } else {
-      dout(10) << " ignoring client" << client << " cap follows " << cap->client_follows << dendl;
+      dout(10) << " ignoring client." << client << " cap follows " << cap->client_follows << dendl;
     }
   }
 
@@ -3550,7 +3550,7 @@ void MDCache::handle_cache_rejoin_weak(MMDSCacheRejoin *weak)
       for (map<client_t,ceph_mds_cap_reconnect>::iterator q = p->second.begin();
           q != p->second.end();
           ++q) {
-       dout(10) << " claiming cap import " << p->first << " client" << q->first << " on " << *in << dendl;
+       dout(10) << " claiming cap import " << p->first << " client." << q->first << " on " << *in << dendl;
        rejoin_import_cap(in, q->first, q->second, from);
       }
     }
@@ -3576,7 +3576,7 @@ void MDCache::handle_cache_rejoin_weak(MMDSCacheRejoin *weak)
       for (map<client_t,ceph_mds_cap_reconnect>::iterator q = p->second.begin();
           q != p->second.end();
           ++q) {
-       dout(10) << " claiming cap import " << p->first << " client" << q->first << dendl;
+       dout(10) << " claiming cap import " << p->first << " client." << q->first << dendl;
        cap_imports[p->first][q->first][from] = q->second;
       }
     }
@@ -4482,7 +4482,7 @@ void MDCache::process_imported_caps()
       for (map<int,ceph_mds_cap_reconnect>::iterator r = q->second.begin();
           r != q->second.end();
           ++r) {
-       dout(20) << " add_reconnected_cap " << in->ino() << " client" << q->first << dendl;
+       dout(20) << " add_reconnected_cap " << in->ino() << " client." << q->first << dendl;
        add_reconnected_cap(in, q->first, inodeno_t(r->second.snaprealm));
        rejoin_import_cap(in, q->first, r->second, r->first);
       }
@@ -4541,9 +4541,9 @@ void MDCache::choose_lock_states_and_reconnect_caps()
           q != p->second.end();
           q++) {
        if (q->second == realm->inode->ino()) {
-         dout(15) << "  client" << q->first << " has correct realm " << q->second << dendl;
+         dout(15) << "  client." << q->first << " has correct realm " << q->second << dendl;
        } else {
-         dout(15) << "  client" << q->first << " has wrong realm " << q->second
+         dout(15) << "  client." << q->first << " has wrong realm " << q->second
                   << " != " << realm->inode->ino() << dendl;
          if (realm->have_past_parents_open()) {
            // ok, include in a split message _now_.
@@ -4589,13 +4589,13 @@ void MDCache::send_snaps(map<client_t,MClientSnap*>& splits)
        p++) {
     Session *session = mds->sessionmap.get_session(entity_name_t::CLIENT(p->first.v));
     if (session) {
-      dout(10) << " client" << p->first
+      dout(10) << " client." << p->first
               << " split " << p->second->head.split
               << " inos " << p->second->split_inos
               << dendl;
       mds->send_message_client_counted(p->second, session);
     } else {
-      dout(10) << " no session for client" << p->first << dendl;
+      dout(10) << " no session for client." << p->first << dendl;
       p->second->put();
     }
   }
@@ -4632,7 +4632,7 @@ void MDCache::clean_open_file_lists()
 
 void MDCache::rejoin_import_cap(CInode *in, client_t client, ceph_mds_cap_reconnect& icr, int frommds)
 {
-  dout(10) << "rejoin_import_cap for client" << client << " from mds." << frommds
+  dout(10) << "rejoin_import_cap for client." << client << " from mds." << frommds
           << " on " << *in << dendl;
   Session *session = mds->sessionmap.get_session(entity_name_t::CLIENT(client.v));
   assert(session);
@@ -4649,7 +4649,7 @@ void MDCache::try_reconnect_cap(CInode *in, Session *session)
   ceph_mds_cap_reconnect *rc = get_replay_cap_reconnect(in->ino(), client);
   if (rc) {
     in->reconnect_cap(client, *rc, session);
-    dout(10) << "try_reconnect_cap client" << client
+    dout(10) << "try_reconnect_cap client." << client
             << " reconnect wanted " << ccap_string(rc->wanted)
             << " issue " << ccap_string(rc->issued)
             << " on " << *in << dendl;
@@ -4826,7 +4826,7 @@ void MDCache::open_undef_dirfrags()
 void MDCache::finish_snaprealm_reconnect(client_t client, SnapRealm *realm, snapid_t seq)
 {
   if (seq < realm->get_newest_seq()) {
-    dout(10) << "finish_snaprealm_reconnect client" << client << " has old seq " << seq << " < " 
+    dout(10) << "finish_snaprealm_reconnect client." << client << " has old seq " << seq << " < " 
             << realm->get_newest_seq()
             << " on " << *realm << dendl;
     // send an update
@@ -4839,7 +4839,7 @@ void MDCache::finish_snaprealm_reconnect(client_t client, SnapRealm *realm, snap
       dout(10) << " ...or not, no session for this client!" << dendl;
     }
   } else {
-    dout(10) << "finish_snaprealm_reconnect client" << client << " up to date"
+    dout(10) << "finish_snaprealm_reconnect client." << client << " up to date"
             << " on " << *realm << dendl;
   }
 }
@@ -5069,7 +5069,7 @@ void MDCache::identify_files_to_recover(vector<CInode*>& recover_q, vector<CInod
         p++) {
       Capability *cap = in->get_client_cap(p->first);
       if (!cap) {
-       dout(10) << " client" << p->first << " has range " << p->second << " but no cap on " << *in << dendl;
+       dout(10) << " client." << p->first << " has range " << p->second << " but no cap on " << *in << dendl;
        recover = true;
        break;
       }
@@ -6079,7 +6079,7 @@ void MDCache::trim_client_leases()
       ClientLease *r = client_leases[pool].front();
       if (r->ttl > now) break;
       CDentry *dn = (CDentry*)r->parent;
-      dout(10) << " expiring client" << r->client << " lease of " << *dn << dendl;
+      dout(10) << " expiring client." << r->client << " lease of " << *dn << dendl;
       dn->remove_client_lease(r, mds->locker);
     }
     int after = client_leases[pool].size();

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index d22e44ad154b2c7bfddc3855c25fdea957db1306..0d93f061f67a8aeccf25afa3b965efaab6bf66c7 100644 (file)
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -394,7 +394,7 @@ void MDS::send_message_client_counted(Message *m, client_t client)
   if (sessionmap.have_session(entity_name_t::CLIENT(client.v))) {
     send_message_client_counted(m, sessionmap.get_session(entity_name_t::CLIENT(client.v)));
   } else {
-    dout(10) << "send_message_client_counted no session for client" << client << " " << *m << dendl;
+    dout(10) << "send_message_client_counted no session for client." << client << " " << *m << dendl;
   }
 }
 

diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index 2b618f752f17a1aae482e2b719715831c12fe9c6..5f3322680c0a751c694969f6bb743124ce692ff9 100644 (file)
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -1039,7 +1039,7 @@ void Migrator::finish_export_inode_caps(CInode *in)
        it != in->client_caps.end();
        it++) {
     Capability *cap = it->second;
-    dout(7) << "finish_export_inode telling client" << it->first
+    dout(7) << "finish_export_inode telling client." << it->first
            << " exported caps on " << *in << dendl;
     MClientCaps *m = new MClientCaps(CEPH_CAP_OP_EXPORT,
                                     in->ino(),
@@ -2325,7 +2325,7 @@ void Migrator::finish_import_inode_caps(CInode *in, int from,
   for (map<client_t,Capability::Export>::iterator it = cap_map.begin();
        it != cap_map.end();
        it++) {
-    dout(10) << "finish_import_inode_caps for client" << it->first << " on " << *in << dendl;
+    dout(10) << "finish_import_inode_caps for client." << it->first << " on " << *in << dendl;
     Session *session = mds->sessionmap.get_session(entity_name_t::CLIENT(it->first.v));
     assert(session);