← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/msg/Message.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/msg/Message.cc
56
56
#include "messages/MOSDPGInfo.h"
57
57
#include "messages/MOSDPGCreate.h"
58
58
#include "messages/MOSDPGTrim.h"
 
59
#include "messages/MOSDPGMissing.h"
59
60
#include "messages/MOSDScrub.h"
60
61
 
61
62
#include "messages/MRemoveSnaps.h"
310
311
  case MSG_OSD_SCRUB:
311
312
    m = new MOSDScrub;
312
313
    break;
313
 
 
314
314
  case MSG_REMOVE_SNAPS:
315
315
    m = new MRemoveSnaps;
316
316
    break;
317
 
 
 
317
  case MSG_OSD_PG_MISSING:
 
318
    m = new MOSDPGMissing;
 
319
    break;
318
320
   // auth
319
321
  case CEPH_MSG_AUTH:
320
322
    m = new MAuth;
513
515
  try {
514
516
    m->decode_payload();
515
517
  }
516
 
  catch (buffer::error *e) {
 
518
  catch (const buffer::error &e) {
517
519
    dout(0) << "failed to decode message of type " << type
518
520
            << " v" << header.version
519
 
            << ": " << *e << dendl;
520
 
    delete e;
 
521
            << ": " << e.what() << dendl;
521
522
    if (g_conf.ms_die_on_bad_msg)
522
523
      assert(0);
523
524
    return 0;