Merge remote-tracking branch 'gh/wip-7988'

Conflicts:
	src/mds/RecoveryQueue.cc

Reviewed-by: Sage Weil <sage@redhat.com>

diff --cc src/common/config_opts.h
Simple merge

diff --cc src/mds/RecoveryQueue.cc
index f811c2c88fefc7ef0c6c5d2dce9b6b249d01740c,5968c5100e480a3646d700fec6b6179a5594cd3c..7d10d7b28afe5bd673dfe29fbdeab8a58c7b4361
--- 1/src/mds/RecoveryQueue.cc
--- 2/src/mds/RecoveryQueue.cc
+++ b/src/mds/RecoveryQueue.cc
@@@ -53,67 -52,39 +53,67 @@@ public
   */
  void RecoveryQueue::advance()
  {
 -  dout(10) << "RecoveryQueue::advance " << file_recover_queue.size() << " queued, "
 +  dout(10) << file_recover_queue.size() << " queued, "
 +         << file_recover_queue_front.size() << " prioritized, "
           << file_recovering.size() << " recovering" << dendl;
  
 -  while (file_recovering.size() < 5 &&
 -       !file_recover_queue.empty()) {
 -    CInode *in = *file_recover_queue.begin();
 -    file_recover_queue.erase(in);
 +  while (file_recovering.size() < g_conf->mds_max_file_recover) {
 +    if (!file_recover_queue_front.empty()) {
 +      CInode *in = *file_recover_queue_front.begin();
 +      file_recover_queue_front.erase(file_recover_queue_front.begin());
 +      file_recover_queue.erase(in);
 +      _start(in);
 +    } else if (!file_recover_queue.empty()) {
 +      CInode *in = *file_recover_queue.begin();
 +      file_recover_queue.erase(file_recover_queue.begin());
 +      _start(in);
 +    } else {
 +      break;
 +    }
 +  }
 +}
  
 -    inode_t *pi = in->get_projected_inode();
 +void RecoveryQueue::_start(CInode *in)
 +{
 +  inode_t *pi = in->get_projected_inode();
  
 -    // blech
 -    if (pi->client_ranges.size() && !pi->get_max_size()) {
 -      mds->clog->warn() << "bad client_range " << pi->client_ranges
 -        << " on ino " << pi->ino << "\n";
 -    }
 +  // blech
 +  if (pi->client_ranges.size() && !pi->get_max_size()) {
-     mds->clog.warn() << "bad client_range " << pi->client_ranges
-                    << " on ino " << pi->ino << "\n";
++    mds->clog->warn() << "bad client_range " << pi->client_ranges
++                    << " on ino " << pi->ino << "\n";
 +  }
  
 -    if (pi->client_ranges.size() && pi->get_max_size()) {
 -      dout(10) << "do_file_recover starting " << in->inode.size << " " << pi->client_ranges
 -             << " " << *in << dendl;
 -      file_recovering.insert(in);
 +  if (pi->client_ranges.size() && pi->get_max_size()) {
 +    dout(10) << "starting " << in->inode.size << " " << pi->client_ranges
 +           << " " << *in << dendl;
 +    file_recovering.insert(in);
 +
 +    C_MDC_Recover *fin = new C_MDC_Recover(this, in);
 +    mds->filer->probe(in->inode.ino, &in->inode.layout, in->last,
 +                    pi->get_max_size(), &fin->size, &fin->mtime, false,
 +                    0, fin);
 +  } else {
 +    dout(10) << "skipping " << in->inode.size << " " << *in << dendl;
 +    in->state_clear(CInode::STATE_RECOVERING);
 +    mds->locker->eval(in, CEPH_LOCK_IFILE);
 +    in->auth_unpin(this);
 +  }
 +}
  
 -      C_MDC_Recover *fin = new C_MDC_Recover(this, in);
 -      mds->filer->probe(in->inode.ino, &in->inode.layout, in->last,
 -                      pi->get_max_size(), &fin->size, &fin->mtime, false,
 -                      0, fin);
 -    } else {
 -      dout(10) << "do_file_recover skipping " << in->inode.size
 -             << " " << *in << dendl;
 -      in->state_clear(CInode::STATE_RECOVERING);
 -      mds->locker->eval(in, CEPH_LOCK_IFILE);
 -      in->auth_unpin(this);
 -    }
 +void RecoveryQueue::prioritize(CInode *in)
 +{
 +  if (file_recovering.count(in)) {
 +    dout(10) << "already working on " << *in << dendl;
 +    return;
 +  }
 +
 +  if (file_recover_queue.count(in)) {
 +    dout(20) << *in << dendl;
 +    file_recover_queue_front.insert(in);
 +    return;
    }
 +
 +  dout(10) << "not queued " << *in << dendl;
  }
  
  

diff --cc src/mds/Server.cc
Simple merge

diff --cc src/mon/LogMonitor.cc
Simple merge

diff --cc src/mon/LogMonitor.h
Simple merge

diff --cc src/mon/MDSMonitor.cc
Simple merge

diff --cc src/mon/Monitor.cc
Simple merge

diff --cc src/mon/Monitor.h
Simple merge

diff --cc src/mon/MonmapMonitor.cc
Simple merge

diff --cc src/mon/OSDMonitor.cc
index 2a3de20ffa45908836f259922d6faa48efc2b750,925081b9c12434d2eca4394dc9b5fe8e892752ed..ba74a1b118e03a2c2fae635e24341ed4effcef9c
--- 1/src/mon/OSDMonitor.cc
--- 2/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@@ -3294,14 -3295,14 +3294,14 @@@ int OSDMonitor::parse_erasure_code_prof
                                           map<string,string> *erasure_code_profile_map,
                                           stringstream &ss)
  {
-   int r = get_str_map(g_conf->osd_pool_default_erasure_code_profile,
-                     ss,
-                     erasure_code_profile_map);
+   int r = get_json_str_map(g_conf->osd_pool_default_erasure_code_profile,
+                          ss,
+                          erasure_code_profile_map);
    if (r)
      return r;
 -  (*erasure_code_profile_map)["directory"] =
 -    g_conf->osd_pool_default_erasure_code_directory;
 -
 +  assert((*erasure_code_profile_map).count("plugin"));
 +  string default_plugin = (*erasure_code_profile_map)["plugin"];
 +  map<string,string> user_map;
    for (vector<string>::const_iterator i = erasure_code_profile.begin();
         i != erasure_code_profile.end();
         ++i) {

diff --cc src/mon/PGMonitor.cc
Simple merge

diff --cc src/mon/Paxos.cc
Simple merge

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/OSDMap.cc
Simple merge

diff --cc src/osd/PG.cc
Simple merge

diff --cc src/osd/ReplicatedPG.cc
Simple merge