RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 01:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

mon/OSDMonitor: assume a minimum cluster size of 3

Browse Source 
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-09-08 08:08:30 -04:00
parent 3ea2e518d2
commit 1010761e6a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mon/OSDMonitor.cc
View File

@ -5542,7 +5542,8 @@ int OSDMonitor::get_crush_rule(const string &rule_name,
int OSDMonitor::check_pg_num(int64_t pool, int pg_num, int size, ostream *ss)
{
int64_t max_pgs_per_osd = g_conf->mon_pg_warn_max_per_osd;
int64_t max_pgs = max_pgs_per_osd * osdmap.get_num_in_osds();
int num_osds = MAX(osdmap.get_num_in_osds(), 3); // assume min cluster size 3
int64_t max_pgs = max_pgs_per_osd * num_osds;
int64_t projected = 0;
if (pool < 0) {
projected += pg_num * size;
@ -5562,7 +5563,7 @@ int OSDMonitor::check_pg_num(int64_t pool, int pg_num, int size, ostream *ss)
<< " would mean " << projected
<< " total pgs, which exceeds max " << max_pgs
<< " (mon_pg_warn_max_per_osd " << max_pgs_per_osd
<< " * num_in_osds " << osdmap.get_num_in_osds() << ")";
<< " * num_in_osds " << num_osds << ")";
return -ERANGE;
}
return 0;