RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-31 07:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

osdc/Objecter: prevent pool dne check from invalidating scan_requests iterator

Browse Source 
We iterate over ops and, if the pool dne and other conditions are true,
we will immediately return ENOENT and cancel an op.  Increment the
iterator at the top of the loop to avoid invalidating it.

We also need to switch to a map<>, because hash_map<> mutations may
invalidate any/all iterators.

Fixes: #3613
Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2012-12-15 17:45:25 -08:00
parent 1ec70aa0dd
commit 4bf9078286
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/osdc/Objecter.cc
View File

@ -439,10 +439,10 @@ void Objecter::scan_requests(bool skipped_map,
}
// check for changed request mappings
for (hash_map<tid_t,Op*>::iterator p = ops.begin();
p != ops.end();
++p) {
map<tid_t,Op*>::iterator p = ops.begin();
while (p != ops.end()) {
Op *op = p->second;
++p; // check_op_pool_dne() may touch ops; prevent iterator invalidation
ldout(cct, 10) << " checking op " << op->tid << dendl;
int r = recalc_op_target(op);
switch (r) {
@ -568,7 +568,7 @@ void Objecter::handle_osd_map(MOSDMap *m)
// unpause requests?
if ((was_pauserd && !pauserd) ||
(was_pausewr && !pausewr))
for (hash_map<tid_t,Op*>::iterator p = ops.begin();
for (map<tid_t,Op*>::iterator p = ops.begin();
p != ops.end();
p++) {
Op *op = p->second;
@ -900,7 +900,7 @@ void Objecter::tick()
cutoff -= cct->_conf->objecter_timeout; // timeout
unsigned laggy_ops = 0;
for (hash_map<tid_t,Op*>::iterator p = ops.begin();
for (map<tid_t,Op*>::iterator p = ops.begin();
p != ops.end();
p++) {
Op *op = p->second;
@ -2010,7 +2010,7 @@ void Objecter::ms_handle_remote_reset(Connection *con)
void Objecter::dump_active()
{
ldout(cct, 20) << "dump_active .. " << num_homeless_ops << " homeless" << dendl;
for (hash_map<tid_t,Op*>::iterator p = ops.begin(); p != ops.end(); p++) {
for (map<tid_t,Op*>::iterator p = ops.begin(); p != ops.end(); p++) {
Op *op = p->second;
ldout(cct, 20) << op->tid << "\t" << op->pgid << "\tosd." << (op->session ? op->session->osd : -1)
<< "\t" << op->oid << "\t" << op->ops << dendl;
@ -2033,7 +2033,7 @@ void Objecter::dump_requests(Formatter& fmt) const
void Objecter::dump_ops(Formatter& fmt) const
{
fmt.open_array_section("ops");
for (hash_map<tid_t,Op*>::const_iterator p = ops.begin();
for (map<tid_t,Op*>::const_iterator p = ops.begin();
p != ops.end();
++p) {
Op *op = p->second;

3
src/osdc/Objecter.h
View File

@ -28,7 +28,6 @@
#include <list>
#include <map>
#include <memory>
#include <ext/hash_map>
using namespace std;
using namespace __gnu_cxx;
@ -884,7 +883,7 @@ public:
private:
// pending ops
hash_map<tid_t,Op*> ops;
map<tid_t,Op*> ops;
int num_homeless_ops;
map<uint64_t, LingerOp*> linger_ops;
map<tid_t,PoolStatOp*> poolstat_ops;