← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/slave/replication_slave.cc

  • Committer: Lee Bieber
  • Date: 2011-02-28 23:00:55 UTC
  • mfrom: (2208.1.4 build)
  • Revision ID: kalebral@gmail.com-20110228230055-g9cq8faquzm5cvpi
Merge Olaf - Remove Session::change_item_tree
Merge Shrew/Joe - 720908: slave will not reconnect if initial connection to master is unsuccessful
Merge Shrews - 723923: Make sleep intervals for slave plugin configurable
Merge Patrck - 726784: dbqp not properly resetting itself after a test failure 

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/slave/replication_slave.cc
61
61
    ("master-user", po::value<string>()->default_value(""))
62
62
    ("master-pass", po::value<string>()->default_value(""))
63
63
    ("max-reconnects", po::value<uint32_t>()->default_value(10))
64
 
    ("seconds-between-reconnects", po::value<uint32_t>()->default_value(30));
 
64
    ("seconds-between-reconnects", po::value<uint32_t>()->default_value(30))
 
65
    ("io-thread-sleep", po::value<uint32_t>()->default_value(5))
 
66
    ("applier-thread-sleep", po::value<uint32_t>()->default_value(5));
65
67
 
66
68
  ifstream cf_stream(_config_file.c_str());
67
69
  po::store(drizzled::program_options::parse_config_file(cf_stream, slave_options), vm);
86
88
  if (vm.count("seconds-between-reconnects"))
87
89
    _producer.setSecondsBetweenReconnects(vm["seconds-between-reconnects"].as<uint32_t>());
88
90
 
 
91
  if (vm.count("io-thread-sleep"))
 
92
    _producer.setSleepInterval(vm["io-thread-sleep"].as<uint32_t>());
 
93
 
 
94
  if (vm.count("applier-thread-sleep"))
 
95
    _consumer.setSleepInterval(vm["applier-thread-sleep"].as<uint32_t>());
 
96
 
89
97
  /* setup schema and tables */
90
98
  ReplicationSchema rs;
91
99
  if (not rs.create())