From: Tao Chang <changtao@hihuron.com>
Date: Mon, 9 May 2016 13:50:17 +0000 (-0400)
Subject: Cleanup: delete find_best_info again
X-Git-Tag: v0.94.10~48^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ad42da47909f2ce6902c9f34e2e9e0c445bb1cc7;p=ceph.git

Cleanup: delete find_best_info again

After called find_best_info find a auth_pg_shard, it must be not incomplete,
so it will not enter find_best_info again.

Signed-off-by: Tao Chang <changtao@hihuron.com>
(cherry picked from commit a25cfc4d46c03d8d78e0254c728ea5c29e2246e1)

Conflicts:
	src/osd/PG.cc (trivial resolution)
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index b8e7f274a8b2..730eb713a064 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1278,25 +1278,7 @@ bool PG::choose_acting(pg_shard_t &auth_log_shard_id)
     return false;
   }
 
-  if ((up.size() &&
-      !all_info.find(up_primary)->second.is_incomplete() &&
-      all_info.find(up_primary)->second.last_update >=
-       auth_log_shard->second.log_tail) &&
-      auth_log_shard->second.is_incomplete()) {
-    map<pg_shard_t, pg_info_t> complete_infos;
-    for (map<pg_shard_t, pg_info_t>::const_iterator i = all_info.begin();
-	 i != all_info.end();
-	 ++i) {
-      if (!i->second.is_incomplete())
-	complete_infos.insert(*i);
-    }
-    map<pg_shard_t, pg_info_t>::const_iterator i = find_best_info(
-      complete_infos);
-    if (i != complete_infos.end()) {
-      auth_log_shard = all_info.find(i->first);
-    }
-  }
-
+  assert(!auth_log_shard->second.is_incomplete());
   auth_log_shard_id = auth_log_shard->first;
 
   // Determine if compatibility needed