summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Just <sam.just@inktank.com>2013-10-01 12:22:00 -0700
committerSamuel Just <sam.just@inktank.com>2013-10-01 12:22:02 -0700
commit334f655c27557e5189480a940672cbc2cda435a2 (patch)
tree5916b9dbbc82c1291d4d17ac287e90fc31a8491b
parentb43bc1a0b0692818d789f9f489b9aba5dd40522f (diff)
downloadceph-334f655c27557e5189480a940672cbc2cda435a2.tar.gz
ReplicatedPG: don't bless C_OSD_SendMessageOnConn
C_OSD_SendMessageOnConn doesn't need to lock the pg. Canceling it resulted in a leaked message. Fixes: 6443 Signed-off-by: Samuel Just <sam.just@inktank.com>
-rw-r--r--src/osd/ReplicatedPG.cc10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index fcaca434ba8..a661aa7f786 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -1602,9 +1602,8 @@ void ReplicatedBackend::_do_push(OpRequestRef op)
reply->compute_cost(cct);
t->register_on_complete(
- get_parent()->bless_context(
- new C_OSD_SendMessageOnConn(
- osd, reply, m->get_connection())));
+ new C_OSD_SendMessageOnConn(
+ osd, reply, m->get_connection()));
get_parent()->queue_transaction(t);
}
@@ -1670,9 +1669,8 @@ void ReplicatedBackend::_do_pull_response(OpRequestRef op)
reply->compute_cost(cct);
t->register_on_complete(
- get_parent()->bless_context(
- new C_OSD_SendMessageOnConn(
- osd, reply, m->get_connection())));
+ new C_OSD_SendMessageOnConn(
+ osd, reply, m->get_connection()));
}
get_parent()->queue_transaction(t);