]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: it's no need to get pg action_primary osd twice in pg scrub 15313/head
authorlinbing <hawkerous@gmail.com>
Fri, 26 May 2017 09:39:39 +0000 (17:39 +0800)
committerlinbing <hawkerous@gmail.com>
Fri, 26 May 2017 13:36:14 +0000 (21:36 +0800)
Signed-off-by: linbing <linbing@t2cloud.net>
src/mon/PGMonitor.cc

index 151468a58970ce7f03198469e211f1505b0811cc..2e7e08fe735c62275f8e089a95839670f46e7b5a 100644 (file)
@@ -1000,12 +1000,12 @@ bool PGMonitor::preprocess_command(MonOpRequestRef op)
       r = -ENOENT;
       goto reply;
     }
-    if (pg_map.pg_stat[pgid].acting_primary == -1) {
+    int osd = pg_map.pg_stat[pgid].acting_primary;
+    if (osd == -1) {
       ss << "pg " << pgid << " has no primary osd";
       r = -EAGAIN;
       goto reply;
     }
-    int osd = pg_map.pg_stat[pgid].acting_primary;
     if (!mon->osdmon()->osdmap.is_up(osd)) {
       ss << "pg " << pgid << " primary osd." << osd << " not up";
       r = -EAGAIN;