← Back to branch summary

~ubuntu-branches/ubuntu/quantal/ceph/quantal

« back to all changes in this revision

Viewing changes to src/mon/LogMonitor.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/mon/LogMonitor.cc
34
34
#define dout_prefix _prefix(mon, paxos->get_version())
35
35
static ostream& _prefix(Monitor *mon, version_t v) {
36
36
  return *_dout << dbeginl
37
 
                << "mon" << mon->whoami
 
37
                << "mon." << mon->name << "@" << mon->rank
38
38
                << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)")))
39
39
                << ".log v" << v << " ";
40
40
}
170
170
 
171
171
 
172
172
  // trim
173
 
  int max = 500;
 
173
  unsigned max = 500;
174
174
  if (mon->is_leader() && paxosv > max)
175
175
    paxos->trim_to(paxosv - max);
176
176