← Back to branch summary

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

« back to all changes in this revision

Viewing changes to .pc/backfill-prio.patch/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:
.pc/backfill-prio.patch/src/osd/OSD.cc
417
417
  osd->pg_stat_queue_dequeue(pg);
418
418
}
419
419
 
 
420
void OSDService::start_shutdown()
 
421
{
 
422
  {
 
423
    Mutex::Locker l(agent_timer_lock);
 
424
    agent_timer.cancel_all_events();
 
425
    agent_timer.shutdown();
 
426
  }
 
427
}
 
428
 
420
429
void OSDService::shutdown()
421
430
{
422
431
  reserver_finisher.stop();
437
446
    Mutex::Locker l(backfill_request_lock);
438
447
    backfill_request_timer.shutdown();
439
448
  }
440
 
  {
441
 
    Mutex::Locker l(agent_timer_lock);
442
 
    agent_timer.shutdown();
443
 
  }
444
449
  osdmap = OSDMapRef();
445
450
  next_osdmap = OSDMapRef();
446
451
}
1603
1608
  cct->_conf->set_val("debug_filestore", "100");
1604
1609
  cct->_conf->set_val("debug_ms", "100");
1605
1610
  cct->_conf->apply_changes(NULL);
1606
 
  
 
1611
 
 
1612
  service.start_shutdown();
 
1613
 
1607
1614
  // Shutdown PGs
1608
1615
  for (ceph::unordered_map<spg_t, PG*>::iterator p = pg_map.begin();
1609
1616
       p != pg_map.end();