kclient: debugfs fix; better osdmap debug output

diff --git a/src/TODO b/src/TODO
index 5e9d6a17cd2f1e1b8dfb113f2af17b034571b931..e5632fd840b30c6b4a1fbb9cf07219964f0a7328 100644 (file)
--- a/src/TODO
+++ b/src/TODO
@@ -17,6 +17,8 @@ v0.16
 /- hadoop: set primary replica on self
 - mds: put migration vectors in mdsmap
 
+- revert 4fe2e6acb9d3613ca041774c1243940d1c8c9c9c
+
 - kclient: retry alloc on ENOMEM when reading from connection?
 - client authentication
 

diff --git a/src/kernel/debugfs.c b/src/kernel/debugfs.c
index 15d2a4bc40fe0736decf06c229ddee236dd464c1..034dde208ac2a023e79ecacb8bb8da0992e7d0fc 100644 (file)
--- a/src/kernel/debugfs.c
+++ b/src/kernel/debugfs.c
@@ -228,7 +228,8 @@ static int osdc_show(struct seq_file *s, void *pp)
 
                req = rb_entry(p, struct ceph_osd_request, r_node);
 
-               seq_printf(s, "%lld\tosd%d\t", req->r_tid, req->r_osd->o_osd);
+               seq_printf(s, "%lld\tosd%d\t", req->r_tid,
+                          req->r_osd ? req->r_osd->o_osd : -1);
 
                head = req->r_request->front.iov_base;
                op = (void *)(head + 1);

diff --git a/src/kernel/osdmap.c b/src/kernel/osdmap.c
index ad7f937376db2fee8316997b60917a71f53e2d09..e38fe6309b1c18134b7361b48e6967e563724293 100644 (file)
--- a/src/kernel/osdmap.c
+++ b/src/kernel/osdmap.c
@@ -787,8 +787,12 @@ int ceph_calc_object_layout(struct ceph_object_layout *ol,
        pgid.pg.ps = ceph_full_name_hash(oid, strlen(oid));
        pgid.pg.preferred = preferred;
        pgid.pg.pool = le32_to_cpu(fl->fl_pg_pool);
-       dout("calc_object_layout '%s' pgid %d.%x (%llx)\n", oid,
-            pgid.pg.pool, pgid.pg.ps, pgid.pg64);
+       if (preferred >= 0)
+               dout("calc_object_layout '%s' pgid %d.%xp%d (%llx)\n", oid,
+                    pgid.pg.pool, pgid.pg.ps, (int)preferred, pgid.pg64);
+       else
+               dout("calc_object_layout '%s' pgid %d.%x (%llx)\n", oid,
+                    pgid.pg.pool, pgid.pg.ps, pgid.pg64);
 
        ol->ol_pgid = cpu_to_le64(pgid.pg64);
        ol->ol_stripe_unit = fl->fl_object_stripe_unit;