From: Dan van der Ster <daniel.vanderster@cern.ch>
Date: Wed, 9 Mar 2016 21:59:09 +0000 (+0100)
Subject: mon: default ec min_size to k+1
X-Git-Tag: v11.0.0~268^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=48e40fcde7b19bab98821ab8d604eab920591284;p=ceph.git

mon: default ec min_size to k+1

If m OSDs are down and we allow writes to the remaining k, the
PG could be unpeerable if one of these k goes down during
subsequent recovery. Default min_size to k+1 to be a bit safer.

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index f6bff252c78d..10ec1f0e3dc9 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -4519,7 +4519,7 @@ int OSDMonitor::prepare_pool_size(const unsigned pool_type,
       err = get_erasure_code(erasure_code_profile, &erasure_code, ss);
       if (err == 0) {
 	*size = erasure_code->get_chunk_count();
-	*min_size = erasure_code->get_data_chunk_count();
+	*min_size = MIN(erasure_code->get_data_chunk_count() + 1, *size);
       }
     }
     break;