From: Yehuda Sadeh <yehuda@hq.newdream.net>
Date: Fri, 29 Jul 2011 18:47:59 +0000 (-0700)
Subject: rgw: fix total time reporting in rgw_admin
X-Git-Tag: v0.33~85
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a4e4c08343edb7d23efdf1a72dd681ef13d718ca;p=ceph.git

rgw: fix total time reporting in rgw_admin
---

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index f5a73b69af42..a7aedbf614f7 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -842,6 +842,8 @@ int main(int argc, char **argv)
     while (!iter.end()) {
       ::decode(entry, iter);
 
+      uint64_t total_time =  entry.total_time.sec() * 1000000LL * entry.total_time.usec();
+
       if (!format) { // for now, keeping backward compatibility a bit
         cout << (entry.owner.size() ? entry.owner : "-" ) << delim
              << entry.bucket << delim
@@ -855,7 +857,7 @@ int main(int argc, char **argv)
              << entry.bytes_sent << delim
              << entry.bytes_received << delim
              << entry.obj_size << delim
-             << entry.total_time.usec() << delim
+             << total_time << delim
              << "\"" << escape_str(entry.user_agent, '"') << "\"" << delim
              << "\"" << escape_str(entry.referrer, '"') << "\"" << std::endl;
       } else {
@@ -876,7 +878,7 @@ int main(int argc, char **argv)
         formatter->dump_value_str("BytesSent", "%lld", entry.bytes_sent);
         formatter->dump_value_str("BytesReceived", "%lld", entry.bytes_received);
         formatter->dump_value_str("ObjectSize", "%lld", entry.obj_size);
-        formatter->dump_value_str("TotalTime", "%lld", (uint64_t)entry.total_time.usec());
+        formatter->dump_value_str("TotalTime", "%lld", total_time);
         formatter->dump_value_str("UserAgent", "%s",  entry.user_agent.c_str());
         formatter->dump_value_str("Referrer", "%s",  entry.referrer.c_str());
         formatter->close_section("LogEntry");