From 0d4dd10bb6e564f309be21f85b0bfe4dc36d3e7e Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 24 Nov 2014 09:23:13 -0800 Subject: [PATCH] os/ObjectStore: drop tolerate_collection_add_enoent This is no longer needed and clutters the interface. Signed-off-by: Sage Weil --- src/os/FileStore.cc | 6 ------ src/os/ObjectStore.h | 25 +++++++++---------------- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc index 4833c3aeb4d0d..dd12cf125ab49 100644 --- a/src/os/FileStore.cc +++ b/src/os/FileStore.cc @@ -2487,8 +2487,6 @@ unsigned FileStore::_do_transaction( tracepoint(objectstore, coll_add_enter); r = _collection_add(ncid, ocid, oid, spos); tracepoint(objectstore, coll_add_exit, r); - if (r == -ENOENT && i.tolerate_collection_add_enoent()) - r = 0; spos.op++; if (r < 0) break; @@ -2670,10 +2668,6 @@ unsigned FileStore::_do_transaction( // -ENOENT is normally okay // ...including on a replayed OP_RMCOLL with checkpoint mode ok = true; - if (r == -ENOENT && ( - op == Transaction::OP_COLL_ADD && - i.tolerate_collection_add_enoent())) - ok = true; // Hack for upgrade from snapcolls to snapmapper if (r == -ENODATA) ok = true; diff --git a/src/os/ObjectStore.h b/src/os/ObjectStore.h index 11b20916f46e1..586333b82d74e 100644 --- a/src/os/ObjectStore.h +++ b/src/os/ObjectStore.h @@ -392,7 +392,6 @@ public: int64_t pool_override; bool use_pool_override; bool replica; - bool tolerate_collection_add_enoent; void *osr; // NULL on replay list on_applied; @@ -400,10 +399,6 @@ public: list on_applied_sync; public: - void set_tolerate_collection_add_enoent() { - tolerate_collection_add_enoent = true; - } - /* Operations on callback contexts */ void register_on_applied(Context *c) { if (!c) return; @@ -559,23 +554,17 @@ public: int64_t pool_override; bool use_pool_override; bool replica; - bool _tolerate_collection_add_enoent; iterator(Transaction *t) : p(t->tbl.begin()), sobject_encoding(t->sobject_encoding), pool_override(t->pool_override), use_pool_override(t->use_pool_override), - replica(t->replica), - _tolerate_collection_add_enoent( - t->tolerate_collection_add_enoent) {} + replica(t->replica) {} friend class Transaction; public: - bool tolerate_collection_add_enoent() const { - return _tolerate_collection_add_enoent; - } /// true if there are more operations left to be enumerated bool have_op() { return !p.end(); @@ -1046,13 +1035,13 @@ public: ops(0), pad_unused_bytes(0), largest_data_len(0), largest_data_off(0), largest_data_off_in_tbl(0), sobject_encoding(false), pool_override(-1), use_pool_override(false), replica(false), - tolerate_collection_add_enoent(false), osr(NULL) {} + osr(NULL) {} Transaction(bufferlist::iterator &dp) : ops(0), pad_unused_bytes(0), largest_data_len(0), largest_data_off(0), largest_data_off_in_tbl(0), sobject_encoding(false), pool_override(-1), use_pool_override(false), replica(false), - tolerate_collection_add_enoent(false), osr(NULL) { + osr(NULL) { decode(dp); } @@ -1060,7 +1049,7 @@ public: ops(0), pad_unused_bytes(0), largest_data_len(0), largest_data_off(0), largest_data_off_in_tbl(0), sobject_encoding(false), pool_override(-1), use_pool_override(false), replica(false), - tolerate_collection_add_enoent(false), osr(NULL) { + osr(NULL) { bufferlist::iterator dp = nbl.begin(); decode(dp); } @@ -1073,7 +1062,10 @@ public: ::encode(largest_data_off, bl); ::encode(largest_data_off_in_tbl, bl); ::encode(tbl, bl); - ::encode(tolerate_collection_add_enoent, bl); + { + bool tolerate_collection_add_enoent = 0; + ::encode(tolerate_collection_add_enoent, bl); + } ENCODE_FINISH(bl); } void decode(bufferlist::iterator &bl) { @@ -1095,6 +1087,7 @@ public: use_pool_override = true; } if (struct_v >= 7) { + bool tolerate_collection_add_enoent; ::decode(tolerate_collection_add_enoent, bl); } DECODE_FINISH(bl); -- 2.39.5