Merge pull request #3915 from dachary/wip-10080-firefly

SimpleMessenger: allow RESETSESSION whenever we forget an endpoint Reviewed-by: Greg Farnum <gfarnum@redhat.com>
ceph · Mar 11, 2015 · b7e3614 · b7e3614
2 parents b5a67f0 + 7ed92f7
commit b7e3614
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/msg/Pipe.cc b/src/msg/Pipe.cc
@@ -549,7 +549,7 @@ int Pipe::accept()
 	       << " > " << existing->connect_seq << dendl;
       goto replace;
     } // existing
-    else if (policy.resetcheck && connect.connect_seq > 0) {
+    else if (connect.connect_seq > 0) {
       // we reset, and they are opening a new session
       ldout(msgr->cct,0) << "accept we reset (peer sent cseq " << connect.connect_seq << "), sending RESETSESSION" << dendl;
       msgr->lock.Unlock();