osd: mark backlog events as BACKLOG

This is purely to make the logs easier to read.

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 919b29666e08e2bf60b89b30add7aafc12c08a05..8d27e2fa959d39b97d03e7886624ee6654dac3c1 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -570,7 +570,7 @@ void PG::generate_backlog()
       osd->store->getattr(info.pgid.to_coll(), poid, "from_version", 
                          &e.prior_version, sizeof(e.prior_version));
     } else {
-      e.op = Log::Entry::MODIFY;           // FIXME when we do smarter op codes!
+      e.op = Log::Entry::BACKLOG;           // FIXME when we do smarter op codes!
     }
     add[e.version] = e;
     dout(10) << "generate_backlog found " << e << dendl;

diff --git a/src/osd/PG.h b/src/osd/PG.h
index ee5863e744a86efcfb4640492119a5520b81e546..f68fe315ab89496b21c35dff2d57f7325b10438a 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -192,6 +192,7 @@ public:
       const static int MODIFY = 1;
       const static int CLONE = 2;  
       const static int DELETE = 3;
+      const static int BACKLOG = 4;  // event invented by generate_backlog
 
       __s32      op;   // write, zero, trunc, remove
       object_t   oid;
@@ -210,7 +211,8 @@ public:
       bool is_delete() const { return op == DELETE; }
       bool is_clone() const { return op == CLONE; }
       bool is_modify() const { return op == MODIFY; }
-      bool is_update() const { return is_clone() || is_modify(); }
+      bool is_backlog() const { return op == BACKLOG; }
+      bool is_update() const { return is_clone() || is_modify() || is_backlog(); }
 
       void encode(bufferlist &bl) const {
        ::encode(op, bl);
@@ -848,7 +850,8 @@ inline ostream& operator<<(ostream& out, const PG::Log::Entry& e)
              << (e.is_delete() ? " - ":
                 (e.is_clone() ? " c ":
                  (e.is_modify() ? " m ":
-                  " ? ")))
+                  (e.is_backlog() ? " b ":
+                   " ? "))))
              << e.oid << " by " << e.reqid;
 }