]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: an interval can't go readwrite if its acting is empty
authorSage Weil <sage@inktank.com>
Thu, 21 Feb 2013 19:15:58 +0000 (11:15 -0800)
committerSage Weil <sage@inktank.com>
Fri, 19 Apr 2013 21:34:07 +0000 (14:34 -0700)
Let's not forget that min_size can be zero.

Fixes: #4159
Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 4277265d99647c9fe950ba627e5d86234cfd70a9)

src/osd/osd_types.cc

index 56619f5a4fc10baa63747b234ead5649c95b4f8e..6709eb099767f900ec95cbdb185ef849ad3a1954 100644 (file)
@@ -1579,7 +1579,8 @@ bool pg_interval_t::check_new_interval(
     i.acting = old_acting;
     i.up = old_up;
 
-    if (i.acting.size() >=
+    if (!i.acting.empty() &&
+       i.acting.size() >=
        osdmap->get_pools().find(pool_id)->second.min_size) {
       if (out)
        *out << "generate_past_intervals " << i