From a6077f6c376a087ab572a95fea5d938b2f103258 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 6 Mar 2012 21:16:06 -0800 Subject: [PATCH] filestore: pass trans_num into _do_transaction This gives us the triple to identify every constituent operation. Signed-off-by: Sage Weil --- src/os/FileStore.cc | 7 ++++--- src/os/FileStore.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc index e6e1b22e28c8d..e0f4e8807967d 100644 --- a/src/os/FileStore.cc +++ b/src/os/FileStore.cc @@ -2245,10 +2245,11 @@ int FileStore::do_transactions(list &tls, uint64_t op_seq) return id; } + int trans_num = 0; for (list::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 a9e3f6cc8b424..52df754ae9d1a 100644 --- a/src/os/FileStore.h +++ b/src/os/FileStore.h @@ -293,7 +293,7 @@ public: unsigned apply_transactions(list& 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& tls, Context *onreadable, Context *ondisk=0, -- 2.39.5