update sources to v12.1.3

[ceph.git] / ceph / src / tools / rbd / action / Info.cc

diff --git a/ceph/src/tools/rbd/action/Info.cc b/ceph/src/tools/rbd/action/Info.cc
index 9f754cc8c270b8a213efc5a8b4e63db0583737aa..7944c0cf74ac34d9711f854edd92a9f75fa0230b 100644 (file)
--- a/ceph/src/tools/rbd/action/Info.cc
+++ b/ceph/src/tools/rbd/action/Info.cc
@@ -130,16 +130,17 @@ static int do_show_info(librados::IoCtx &io_ctx, librbd::Image& image,
 
   std::string prefix = image.get_block_name_prefix();
 
-  librbd::group_spec_t group_spec;
-  r = image.get_group(&group_spec);
-  if (r < 0) {
-    return r;
+  struct timespec create_timestamp;
+  image.get_create_timestamp(&create_timestamp);
+
+  string create_timestamp_str = "";
+  if(create_timestamp.tv_sec != 0) {
+    time_t timestamp = create_timestamp.tv_sec;
+    create_timestamp_str = ctime(&timestamp);
+    create_timestamp_str = create_timestamp_str.substr(0,
+        create_timestamp_str.length() - 1);
   }
 
-  std::string group_string = "";
-  if (-1 != group_spec.pool)
-    group_string = stringify(group_spec.pool) + "." + group_spec.name;
-
   if (f) {
     f->open_object_section("image");
     if (!imgname.empty()) {
@@ -178,12 +179,12 @@ static int do_show_info(librados::IoCtx &io_ctx, librbd::Image& image,
     format_flags(f, flags);
   }
 
-  if (!group_string.empty()) {
+  if (!create_timestamp_str.empty()) {
     if (f) {
-      f->dump_string("group", group_string);
+      f->dump_string("create_timestamp", create_timestamp_str);
     } else {
-      std::cout << "\tconsistency group: " << group_string
-               << std::endl;
+      std::cout << "\tcreate_timestamp: " << create_timestamp_str
+                << std::endl;
     }
   }