RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-10 21:20:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd: less log noise

Browse Source
This commit is contained in:
Sage Weil 2010-08-26 12:56:40 -07:00
parent c3b97ffc1f
commit 412a1c8b06
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/osd/OSD.cc
View File

@ -1646,7 +1646,7 @@ void OSD::send_pg_stats()
if (osd_stat_updated || !pg_stat_queue.empty()) {
osd_stat_updated = false;
dout(1) << "send_pg_stats - " << pg_stat_queue.size() << " pgs updated" << dendl;
dout(10) << "send_pg_stats - " << pg_stat_queue.size() << " pgs updated" << dendl;
utime_t had_for = g_clock.now();
had_for -= had_map_since;
@ -4393,11 +4393,11 @@ void OSD::handle_op(MOSDOp *op)
int err = -EPERM;
if (op->may_read() && !(perm & OSD_POOL_CAP_R)) {
dout(0) << "no READ permission to access pool " << pg->pool->name << dendl;
dout(10) << "no READ permission to access pool " << pg->pool->name << dendl;
} else if (op->may_write() && !(perm & OSD_POOL_CAP_W)) {
dout(0) << "no WRITE permission to access pool " << pg->pool->name << dendl;
dout(10) << "no WRITE permission to access pool " << pg->pool->name << dendl;
} else if (op->require_exec_caps() && !(perm & OSD_POOL_CAP_X)) {
dout(0) << "no EXEC permission to access pool " << pg->pool->name << dendl;
dout(10) << "no EXEC permission to access pool " << pg->pool->name << dendl;
} else {
err = 0;
}
@ -4763,7 +4763,7 @@ int OSD::get_class(const string& cname, ClassVersion& version, pg_t pgid, Messag
case ClassHandler::ClassData::CLASS_LOADED:
return 0;
case ClassHandler::ClassData::CLASS_INVALID:
dout(0) << "class not supported" << dendl;
dout(1) << "class " << cname << " not supported" << dendl;
return -EOPNOTSUPP;
default:
assert(0);
@ -4793,7 +4793,7 @@ void OSD::handle_class(MClass *m)
return;
Mutex::Locker l(class_lock);
dout(0) << "handle_class action=" << m->action << dendl;
dout(10) << "handle_class action=" << m->action << dendl;
switch (m->action) {
case CLASS_RESPONSE:
@ -4850,7 +4850,7 @@ void OSD::init_op_flags(MOSDOp *op)
is_write = flags & CLS_METHOD_WR;
is_public = flags & CLS_METHOD_PUBLIC;
dout(0) << "class " << cname << " method " << mname
dout(10) << "class " << cname << " method " << mname
<< " flags=" << (is_read ? "r" : "") << (is_write ? "w" : "") << dendl;
if (is_read)
op->rmw_flags |= CEPH_OSD_FLAG_READ;

16
src/osd/ReplicatedPG.cc
View File

@ -402,7 +402,7 @@ bool ReplicatedPG::preprocess_op(MOSDOp *op, utime_t now)
void ReplicatedPG::do_pg_op(MOSDOp *op)
{
dout(0) << "do_pg_op " << *op << dendl;
dout(10) << "do_pg_op " << *op << dendl;
bufferlist outdata;
int result = 0;
@ -1074,7 +1074,6 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops,
case CEPH_OSD_OP_READ:
{
dout(0) << "CEPH_OSD_OP_READ" << dendl;
// read into a buffer
bufferlist bl;
int r = osd->store->read(coll_t::build_pg_coll(info.pgid), soid, op.extent.offset, op.extent.length, bl);
@ -1089,7 +1088,7 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops,
}
info.stats.num_rd_kb += SHIFT_ROUND_UP(op.extent.length, 10);
info.stats.num_rd++;
dout(0) << " read got " << r << " / " << op.extent.length << " bytes from obj " << soid << dendl;
dout(10) << " read got " << r << " / " << op.extent.length << " bytes from obj " << soid << dendl;
__u32 seq = oi.truncate_seq;
// are we beyond truncate_size?
@ -1106,7 +1105,7 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops,
bufferlist keep;
// keep first part of odata; trim at truncation point
dout(0) << " obj " << soid << " seq " << seq
dout(10) << " obj " << soid << " seq " << seq
<< ": trimming overlap " << from << "~" << trim << dendl;
keep.substr_of(odata, 0, odata.length() - trim);
odata.claim(keep);
@ -1193,7 +1192,6 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops,
case CEPH_OSD_OP_CMPXATTR:
{
dout(0) << "CEPH_OSD_OP_CMPXATTR" << dendl;
string aname;
bp.copy(op.xattr.name_len, aname);
string name = "_" + aname;
@ -1231,16 +1229,16 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops,
}
if (!result) {
dout(0) << "comparison returned false" << dendl;
dout(10) << "comparison returned false" << dendl;
result = -ECANCELED;
break;
}
if (result < 0) {
dout(0) << "comparison returned " << result << " " << strerror(-result) << dendl;
dout(10) << "comparison returned " << result << " " << strerror(-result) << dendl;
break;
}
dout(0) << "comparison returned true" << dendl;
dout(10) << "comparison returned true" << dendl;
info.stats.num_rd++;
}
break;
@ -3509,7 +3507,7 @@ void ReplicatedPG::sub_op_push(MOSDSubOp *op)
dout(10) << "sub_op_push need " << data_needed << ", got " << data_subset << dendl;
if (!data_needed.subset_of(data_subset)) {
dout(0) << " we did not get enough of " << soid << " object data" << dendl;
dout(0) << "sub_op_push we did not get enough of " << soid << " object data" << dendl;
op->put();
return;
}