diff options
| author | Samuel Just <sam.just@inktank.com> | 2012-12-14 12:43:08 -0800 |
|---|---|---|
| committer | Samuel Just <sam.just@inktank.com> | 2012-12-14 13:38:37 -0800 |
| commit | 7e1335691d83774377df8198bb09e3ecb4528966 (patch) | |
| tree | 6090853a1b3f196f70dc603f869c04a905b5b1e6 | |
| parent | b63940caa11cdf549962ca4eae404c55f7784eac (diff) | |
| download | ceph-7e1335691d83774377df8198bb09e3ecb4528966.tar.gz | |
ReplicatedPG: do not use priority from client op
There are internal ordering requirements which may be sensitive
to assigned priority. We don't want a mix of priorities from
old clients with priorities from new clients causing trouble.
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/osd/ReplicatedPG.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index cf1b1f14683..e0bcb5046d3 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -119,7 +119,7 @@ void ReplicatedPG::wait_for_missing_object(const hobject_t& soid, OpRequestRef o } else { dout(7) << "missing " << soid << " v " << v << ", pulling." << dendl; - pull(soid, v, op->request->get_priority()); + pull(soid, v, g_conf->osd_client_op_priority); } waiting_for_missing_object[soid].push_back(op); op->mark_delayed(); @@ -175,7 +175,7 @@ void ReplicatedPG::wait_for_degraded_object(const hobject_t& soid, OpRequestRef break; } } - recover_object_replicas(soid, v, op->request->get_priority()); + recover_object_replicas(soid, v, g_conf->osd_client_op_priority); } waiting_for_degraded_object[soid].push_back(op); op->mark_delayed(); |