← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/ceph_mon.cc

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2012-07-16 09:56:24 UTC
  • mfrom: (0.3.11)
  • mto: This revision was merged to the branch mainline in revision 17.
  • Revision ID: package-import@ubuntu.com-20120716095624-azr2w4hbhei1rxmx
Tags: upstream-0.48
Import upstream version 0.48

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ceph_mon.cc
41
41
#include "global/global_init.h"
42
42
#include "global/signal_handler.h"
43
43
 
 
44
#include "include/assert.h"
 
45
 
44
46
#define dout_subsys ceph_subsys_mon
45
47
 
46
48
extern CompatSet get_ceph_mon_feature_compat_set();
124
126
      }
125
127
      try {
126
128
        monmap.decode(monmapbl);
 
129
 
 
130
        // always mark seed/mkfs monmap as epoch 0
 
131
        monmap.set_epoch(0);
127
132
      }
128
133
      catch (const buffer::error& e) {
129
134
        cerr << argv[0] << ": error decoding monmap " << g_conf->monmap << ": " << e.what() << std::endl;
130
135
        exit(1);
131
136
      }      
132
137
    } else {
133
 
      int err = MonClient::build_initial_monmap(g_ceph_context, monmap);
 
138
      int err = monmap.build_initial(g_ceph_context, cerr);
134
139
      if (err < 0) {
135
 
        cerr << argv[0] << ": error generating initial monmap: " << cpp_strerror(err) << std::endl;
136
 
        usage();
137
 
        exit(1);
 
140
        cerr << argv[0] << ": warning: no initial monitors; must use admin socket to feed hints" << std::endl;
138
141
      }
139
142
 
140
143
      // am i part of the initial quorum?
278
281
      tmp.set_epoch(v);
279
282
    }
280
283
    bufferlist mapbl;
281
 
    tmp.encode(mapbl);
 
284
    tmp.encode(mapbl, CEPH_FEATURES_ALL);
282
285
    bufferlist final;
283
286
    ::encode(v, final);
284
287
    ::encode(mapbl, final);
346
349
      ipaddr = g_conf->public_addr;
347
350
    } else {
348
351
      MonMap tmpmap;
349
 
      int err = MonClient::build_initial_monmap(g_ceph_context, tmpmap);
 
352
      int err = tmpmap.build_initial(g_ceph_context, cerr);
350
353
      if (err < 0) {
351
354
        cerr << argv[0] << ": error generating initial monmap: " << cpp_strerror(err) << std::endl;
352
355
        usage();
385
388
                        Messenger::Policy::stateless_server(supported,
386
389
                                                            CEPH_FEATURE_PGID64 |
387
390
                                                            CEPH_FEATURE_OSDENC));
 
391
  messenger->set_policy(entity_name_t::TYPE_CLIENT,
 
392
                        Messenger::Policy::stateless_server(supported, 0));
 
393
  messenger->set_policy(entity_name_t::TYPE_MDS,
 
394
                        Messenger::Policy::stateless_server(supported, 0));
 
395
 
 
396
 
 
397
  // throttle client traffic
 
398
  Throttle client_throttler(g_ceph_context, "mon_client_bytes",
 
399
                            g_conf->mon_client_bytes);
 
400
  messenger->set_policy_throttler(entity_name_t::TYPE_CLIENT, &client_throttler);
 
401
  messenger->set_policy_throttler(entity_name_t::TYPE_OSD, &client_throttler);
 
402
  messenger->set_policy_throttler(entity_name_t::TYPE_MDS, &client_throttler);
388
403
 
389
404
  global_print_banner();
390
405