RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-17 17:05:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source 
git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@585 29311d96-e01e-0410-9327-a35deaab8ce9
This commit is contained in:
sage 2006-02-01 05:40:48 +00:00
parent 8bf725f74a
commit a27897fd81
4 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ceph/mds/CDentry.cc
View File

@ -19,6 +19,9 @@ ostream& operator<<(ostream& out, CDentry& dn)
if (dn.is_dirty()) out << " dirty";
if (dn.get_lockstate() == DN_LOCK_PREXLOCK) out << " prexlock=" << dn.get_xlockedby() << " g=" << dn.get_gather_set();
if (dn.get_lockstate() == DN_LOCK_XLOCK) out << " xlock=" << dn.get_xlockedby();
out << " dirv=" << dn.get_parent_dir_version();
out << " inode=" << dn.get_inode();
out << " " << &dn;
out << " in " << *dn.get_dir();
@ -48,6 +51,8 @@ void CDentry::mark_dirty()
}
void CDentry::mark_clean() {
dout(10) << " mark_clean " << *this << endl;
assert(parent_dir_version <= dir->get_version());
assert(parent_dir_version >= dir->get_last_committed_version());
if (is_primary() && dirty && inode) inode->put(CINODE_PIN_DNDIRTY);
dirty = false;

5
ceph/mds/CDir.cc
View File

@ -71,6 +71,11 @@ ostream& operator<<(ostream& out, CDir& dir)
out << " state=" << dir.get_state();
out << " sz=" << dir.get_nitems() << "+" << dir.get_nnull();
out << " v=" << dir.get_version();
out << " cv=" << dir.get_committing_version();
out << " lastcv=" << dir.get_last_committed_version();
out << " " << &dir;
return out << "]";
}

11
ceph/mds/MDLog.cc
View File

@ -31,6 +31,17 @@ MDLog::MDLog(MDS *m)
char name[80];
sprintf(name, "mds%d.log", mds->get_nodeid());
logger = new Logger(name, (LogType*)&mdlog_logtype);
static bool didit = false;
if (!didit) {
mdlog_logtype.add_inc("add");
mdlog_logtype.add_inc("retire");
mdlog_logtype.add_inc("obs");
mdlog_logtype.add_inc("trim");
mdlog_logtype.add_set("size");
mdlog_logtype.add_set("read");
mdlog_logtype.add_set("append");
}
}

4
ceph/mds/MDStore.cc
View File

@ -658,7 +658,7 @@ void MDStore::commit_dir_slice_2( int result,
__uint64_t committed_version,
int hashcode )
{
dout(11) << "commit_dir_slice_2 hashcode " << hashcode << " " << *dir << endl;
dout(11) << "commit_dir_slice_2 hashcode " << hashcode << " " << *dir << " v " << committed_version << endl;
// mark inodes and dentries clean too (if we committed them!)
list<CDentry*> null_clean;
@ -690,7 +690,7 @@ void MDStore::commit_dir_slice_2( int result,
} else {
dout(15) << " dir " << committed_version << " < dn " << dn->get_parent_dir_version() << " still dirty " << *dn << endl;
assert(committed_version < dn->get_parent_dir_version());
assert(dn->is_dirty() || !dn->is_sync());
//assert(dn->is_dirty() || !dn->is_sync()); // -OR- we did a fetch_dir in order to do a newer commit...
}
// only do primary...