From: Matt Benjamin <mbenjamin@redhat.com>
Date: Wed, 5 Jun 2019 14:40:08 +0000 (-0400)
Subject: rgw_file: pretty-print fh_key
X-Git-Tag: v15.1.0~2540^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=84a2c22108a3d15b836680894ba750b637e49cd2;p=ceph-ci.git

rgw_file: pretty-print fh_key

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
---

diff --git a/src/rgw/rgw_file.cc b/src/rgw/rgw_file.cc
index cf6c0f53039..74982308a64 100644
--- a/src/rgw/rgw_file.cc
+++ b/src/rgw/rgw_file.cc
@@ -942,6 +942,15 @@ namespace rgw {
     rele();
   } /* RGWLibFS::close */
 
+  inline std::ostream& operator<<(std::ostream &os, fh_key const &fhk) {
+    os << "<fh_key: bucket=";
+    os << fhk.fh_hk.bucket;
+    os << "; object=";
+    os << fhk.fh_hk.object;
+    os << ">";
+    return os;
+  }
+
   inline std::ostream& operator<<(std::ostream &os, struct timespec const &ts) {
       os << "<timespec: tv_sec=";
       os << ts.tv_sec;
diff --git a/src/rgw/rgw_file.h b/src/rgw/rgw_file.h
index 8ae249ef418..e2395be3a56 100644
--- a/src/rgw/rgw_file.h
+++ b/src/rgw/rgw_file.h
@@ -144,6 +144,9 @@ namespace rgw {
       }
       DECODE_FINISH(bl);
     }
+
+    friend std::ostream& operator<<(std::ostream &os, fh_key const &fhk);
+
   }; /* fh_key */
 
   WRITE_CLASS_ENCODER(fh_key);
@@ -1055,15 +1058,15 @@ namespace rgw {
 
       std::string obj_name{name};
       std::string key_name{parent->make_key_name(name)};
+      fh_key fhk = parent->make_fhk(obj_name);
 
       lsubdout(get_context(), rgw, 10)
 	<< __func__ << " lookup called on "
 	<< parent->object_name() << " for " << key_name
 	<< " (" << obj_name << ")"
+	<< " -> " << fhk
 	<< dendl;
 
-      fh_key fhk = parent->make_fhk(obj_name);
-
     retry:
       RGWFileHandle* fh =
 	fh_cache.find_latch(fhk.fh_hk.object /* partition selector*/,