]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
osd/pg: fold sanity check into one single "if" qualification
authorxie xingguo <xie.xingguo@zte.com.cn>
Fri, 25 Mar 2016 02:09:29 +0000 (10:09 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Fri, 25 Mar 2016 14:14:20 +0000 (22:14 +0800)
Just as "boost::statechart::result
PG::RecoveryState::WaitRemoteBackfillReserved::react(const RemoteBackfillReserved &evt)"
does.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/osd/PG.cc

index e5d076a72842d6a370f79244e106e87b90369542..e7974df77a056231b8e712f305c65748cdc8e8e4 100644 (file)
@@ -6388,9 +6388,6 @@ PG::RecoveryState::WaitRemoteRecoveryReserved::react(const RemoteRecoveryReserve
 
   if (remote_recovery_reservation_it != context< Active >().remote_shards_to_reserve_recovery.end()) {
     assert(*remote_recovery_reservation_it != pg->pg_whoami);
-  }
-
-  if (remote_recovery_reservation_it != context< Active >().remote_shards_to_reserve_recovery.end()) {
     ConnectionRef con = pg->osd->get_con_osd_cluster(
       remote_recovery_reservation_it->osd, pg->get_osdmap()->get_epoch());
     if (con) {