← Back to branch summary

~james-page/ubuntu/vivid/ceph/0.93

« back to all changes in this revision

Viewing changes to src/osd/OSD.cc

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-07-30 10:15:40 UTC
  • mfrom: (0.1.29 sid)
  • Revision ID: package-import@ubuntu.com-20140730101540-b7gsn9jqkye4a5ty
Tags: 0.80.5-1
* New upstream stable release:
  - d/p/firefly-post-release.patch: Dropped, no longer required.
  - d/lib{rados2,cephfs1}.symbols: Update with new symbols.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/osd/OSD.cc
419
419
  osd->pg_stat_queue_dequeue(pg);
420
420
}
421
421
 
 
422
void OSDService::start_shutdown()
 
423
{
 
424
  {
 
425
    Mutex::Locker l(agent_timer_lock);
 
426
    agent_timer.cancel_all_events();
 
427
    agent_timer.shutdown();
 
428
  }
 
429
}
 
430
 
422
431
void OSDService::shutdown()
423
432
{
424
433
  reserver_finisher.stop();
439
448
    Mutex::Locker l(backfill_request_lock);
440
449
    backfill_request_timer.shutdown();
441
450
  }
442
 
  {
443
 
    Mutex::Locker l(agent_timer_lock);
444
 
    agent_timer.shutdown();
445
 
  }
446
451
  osdmap = OSDMapRef();
447
452
  next_osdmap = OSDMapRef();
448
453
}
1605
1610
  cct->_conf->set_val("debug_filestore", "100");
1606
1611
  cct->_conf->set_val("debug_ms", "100");
1607
1612
  cct->_conf->apply_changes(NULL);
1608
 
  
 
1613
 
 
1614
  service.start_shutdown();
 
1615
 
1609
1616
  // Shutdown PGs
1610
1617
  for (ceph::unordered_map<spg_t, PG*>::iterator p = pg_map.begin();
1611
1618
       p != pg_map.end();