From 006a55cec88b70b8effce45e67796dbe6c14a723 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 16 Apr 2008 13:04:02 -0700 Subject: [PATCH] adjust verbosity --- src/kernel/inode.c | 6 +++--- src/kernel/mds_client.c | 6 +++--- src/kernel/super.c | 2 +- src/mds/Server.cc | 2 +- src/start.sh | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/kernel/inode.c b/src/kernel/inode.c index d8a7ef385681f..640580deaa830 100644 --- a/src/kernel/inode.c +++ b/src/kernel/inode.c @@ -724,17 +724,17 @@ void ceph_cap_delayed_work(struct work_struct *work) i_cap_dwork.work); spin_lock(&ci->vfs_inode.i_lock); if (ci->i_hold_caps_until > jiffies) { - dout(-10, "cap_dwork on %p -- rescheduling\n", &ci->vfs_inode); + dout(10, "cap_dwork on %p -- rescheduling\n", &ci->vfs_inode); schedule_delayed_work(&ci->i_cap_dwork, ci->i_hold_caps_until - jiffies); spin_unlock(&ci->vfs_inode.i_lock); goto out; } - dout(-10, "cap_dwork on %p\n", &ci->vfs_inode); + dout(10, "cap_dwork on %p\n", &ci->vfs_inode); spin_unlock(&ci->vfs_inode.i_lock); ceph_check_caps(ci, 0); out: - dout(-10, "cap_dwork on %p done\n", &ci->vfs_inode); + dout(10, "cap_dwork on %p done\n", &ci->vfs_inode); } /* diff --git a/src/kernel/mds_client.c b/src/kernel/mds_client.c index 2b8a29f719c10..be00fa7ce9d20 100644 --- a/src/kernel/mds_client.c +++ b/src/kernel/mds_client.c @@ -759,7 +759,7 @@ void ceph_mdsc_handle_session(struct ceph_mds_client *mdsc, session = __get_session(mdsc, mds); down(&session->s_mutex); - dout(-1, "handle_session %p op %d seq %llu\n", session, op, seq); + dout(1, "handle_session %p op %d seq %llu\n", session, op, seq); switch (op) { case CEPH_SESSION_OPEN: dout(1, "session open from mds%d\n", mds); @@ -1631,7 +1631,7 @@ void schedule_delayed(struct ceph_mds_client *mdsc) */ int delay = 5; unsigned hz = round_jiffies_relative(HZ * delay); - dout(-10, "schedule_delayed for %d seconds (%u hz)\n", delay, hz); + dout(10, "schedule_delayed for %d seconds (%u hz)\n", delay, hz); schedule_delayed_work(&mdsc->delayed_work, hz); } @@ -1644,7 +1644,7 @@ void delayed_work(struct work_struct *work) int renew_interval = mdsc->mdsmap->m_cap_bit_timeout >> 1; int renew_caps = (jiffies >= HZ*renew_interval + mdsc->last_renew_caps); - dout(-10, "delayed_work on %p renew_caps=%d\n", mdsc, renew_caps); + dout(10, "delayed_work on %p renew_caps=%d\n", mdsc, renew_caps); /* renew caps */ spin_lock(&mdsc->lock); diff --git a/src/kernel/super.c b/src/kernel/super.c index 379aadda961e5..b2b651879a31b 100644 --- a/src/kernel/super.c +++ b/src/kernel/super.c @@ -163,7 +163,7 @@ static struct inode *ceph_alloc_inode(struct super_block *sb) static void ceph_destroy_inode(struct inode *inode) { struct ceph_inode_info *ci = ceph_inode(inode); - dout(-30, "destroy_inode %p ino %llx\n", inode, ceph_ino(inode)); + dout(30, "destroy_inode %p ino %llx\n", inode, ceph_ino(inode)); cancel_delayed_work_sync(&ci->i_cap_dwork); kfree(ci->i_symlink); kmem_cache_free(ceph_inode_cachep, ci); diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 22ef2a6c51763..1fff74489dbbc 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -222,7 +222,7 @@ void Server::_session_logged(Session *session, bool open, version_t pv) while (!session->caps.empty()) { Capability *cap = session->caps.front(); CInode *in = cap->get_inode(); - dout(20) << " killing capability on " << *in << dendl; + dout(20) << " killing capability " << cap_string(cap->issued()) << " on " << *in << dendl; in->remove_client_cap(session->inst.name.num()); } while (!session->leases.empty()) { diff --git a/src/start.sh b/src/start.sh index dbfe81f390887..3bed77c77e1a1 100755 --- a/src/start.sh +++ b/src/start.sh @@ -27,10 +27,10 @@ $CEPH_BIN/monmaptool --create --clobber --add $IP:12345 --print .ceph_monmap $CEPH_BIN/mkmonfs --clobber mondata/mon0 --mon 0 --monmap .ceph_monmap # shared args -ARGS="-d --bind $IP -o out --debug_ms 1" +ARGS="-d --bind $IP -o out" # start monitor -$CEPH_BIN/cmon $ARGS mondata/mon0 --debug_mon 20 --debug_ms 20 +$CEPH_BIN/cmon $ARGS mondata/mon0 --debug_mon 10 --debug_ms 1 # build and inject an initial osd map $CEPH_BIN/osdmaptool --clobber --createsimple .ceph_monmap 4 --print .ceph_osdmap @@ -39,11 +39,11 @@ $CEPH_BIN/cmonctl osd setmap -i .ceph_osdmap for osd in 0 #1 2 3 do $CEPH_BIN/cosd --mkfs_for_osd $osd dev/osd$osd # initialize empty object store - $CEPH_BIN/cosd $ARGS dev/osd$osd --debug_osd 40 + $CEPH_BIN/cosd $ARGS dev/osd$osd #--debug_osd 40 done # mds -$CEPH_BIN/cmds $ARGS --debug_mds 20 --debug_ms 20 +$CEPH_BIN/cmds $ARGS # --debug_ms 1 #--debug_mds 20 --debug_ms 20 echo "started. stop.sh to stop. see out/* (e.g. 'tail -f out/????') for debug output." -- 2.39.5