← Back to branch summary

~ubuntu-branches/ubuntu/precise/ceph/precise

« back to all changes in this revision

Viewing changes to src/osdc/Journaler.cc

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum, Clint Byrum, Micah Gersten
  • Date: 2011-02-12 22:50:26 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20110212225026-yyyw4tk0msgql3ul
Tags: 0.24.2-0ubuntu1
https://launchpad.net/bugs/658670
https://launchpad.net/bugs/684011
[ Clint Byrum <clint@ubuntu.com> ]
* New upstream release. (LP: #658670, LP: #684011)
* debian/patches/fix-mkcephfs.patch: dropped (applied upstream)
* Removed .la files from libceph1-dev, libcrush1-dev and 
  librados1-dev (per Debian policy v3.9.1 10.2).
* debian/control: adding pkg-config as a build dependency
* debian/control: depend on libcrypto++-dev instead of libssl-dev
* debian/watch: added watch file

[ Micah Gersten <micahg@ubuntu.com> ]
* debian/control: add Homepage

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/osdc/Journaler.cc
102
102
  vector<snapid_t> snaps;
103
103
 
104
104
  object_t oid = file_object_t(ino, 0);
105
 
  ceph_object_layout ol = objecter->osdmap->make_object_layout(oid, pg_pool);
106
 
  objecter->read_full(oid, ol, CEPH_NOSNAP, &fin->bl, 0, fin);
 
105
  object_locator_t oloc(pg_pool);
 
106
  objecter->read_full(oid, oloc, CEPH_NOSNAP, &fin->bl, 0, fin);
107
107
}
108
108
 
109
109
void Journaler::_finish_read_head(int r, bufferlist& bl)
205
205
  SnapContext snapc;
206
206
  
207
207
  object_t oid = file_object_t(ino, 0);
208
 
  ceph_object_layout ol = objecter->osdmap->make_object_layout(oid, pg_pool);
209
 
  objecter->write_full(oid, ol, snapc, bl, g_clock.now(), 0, 
 
208
  object_locator_t oloc(pg_pool);
 
209
  objecter->write_full(oid, oloc, snapc, bl, g_clock.now(), 0, 
210
210
                       NULL, 
211
211
                       new C_WriteHead(this, last_written, oncommit));
212
212
}
473
473
      if (write_buf.length() < g_conf.journaler_batch_max) {
474
474
        // delay!  schedule an event.
475
475
        dout(20) << "flush delaying flush" << dendl;
476
 
        if (delay_flush_event) timer.cancel_event(delay_flush_event);
 
476
        if (delay_flush_event)
 
477
          timer->cancel_event(delay_flush_event);
477
478
        delay_flush_event = new C_DelayFlush(this);
478
 
        timer.add_event_after(g_conf.journaler_batch_interval, delay_flush_event);      
 
479
        timer->add_event_after(g_conf.journaler_batch_interval, delay_flush_event);     
479
480
      } else {
480
481
        dout(20) << "flush not delaying flush" << dendl;
481
482
        _do_flush();