filestore: pass trans_num into _do_transaction

This gives us the <op_seq, trans_num, op_num> triple to identify every
constituent operation.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index e6e1b22e28c8dab1ce7cb217f1e4b67e5d7c39f4..e0f4e8807967d6f5731d38faa9d2814626f618b6 100644 (file)
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -2245,10 +2245,11 @@ int FileStore::do_transactions(list<Transaction*> &tls, uint64_t op_seq)
     return id;
   }
     
+  int trans_num = 0;
   for (list<Transaction*>::iterator p = tls.begin();
        p != tls.end();
-       p++) {
-    r = _do_transaction(**p, op_seq);
+       p++, trans_num++) {
+    r = _do_transaction(**p, op_seq, trans_num);
     if (r < 0)
       break;
   }
@@ -2333,7 +2334,7 @@ void FileStore::_transaction_finish(int fd)
   TEMP_FAILURE_RETRY(::close(fd));
 }
 
-unsigned FileStore::_do_transaction(Transaction& t, uint64_t op_seq)
+unsigned FileStore::_do_transaction(Transaction& t, uint64_t op_seq, int trans_num)
 {
   dout(10) << "_do_transaction on " << &t << dendl;
 

diff --git a/src/os/FileStore.h b/src/os/FileStore.h
index a9e3f6cc8b42475d7b3d88a35152310afd7663eb..52df754ae9d1a786464148bee889d52d55d643fb 100644 (file)
--- a/src/os/FileStore.h
+++ b/src/os/FileStore.h
@@ -293,7 +293,7 @@ public:
   unsigned apply_transactions(list<Transaction*>& tls, Context *ondisk=0);
   int _transaction_start(uint64_t bytes, uint64_t ops);
   void _transaction_finish(int id);
-  unsigned _do_transaction(Transaction& t, uint64_t op_seq);
+  unsigned _do_transaction(Transaction& t, uint64_t op_seq, int trans_num);
 
   int queue_transaction(Sequencer *osr, Transaction* t);
   int queue_transactions(Sequencer *osr, list<Transaction*>& tls, Context *onreadable, Context *ondisk=0,