Merge pull request #592 from ceph/wip-6287

mon/OSDMonitor: make busy creating pgs message more explicit

Reviewed-by: Dan Mick <dan.mick@inktank.com>
This commit is contained in:
Dan Mick 2013-09-20 15:44:34 -07:00
commit 08a97ae45f

View File

@ -3599,7 +3599,7 @@ done:
ss << "specified pg_num " << n << " <= current " << p->get_pg_num();
err = -EINVAL;
} else if (!mon->pgmon()->pg_map.creating_pgs.empty()) {
ss << "currently creating pgs, wait";
ss << "busy creating pgs; try again later";
err = -EAGAIN;
} else {
pending_inc.get_new_pool(pool, p)->set_pg_num(n);
@ -3609,7 +3609,7 @@ done:
if (n > p->get_pg_num()) {
ss << "specified pgp_num " << n << " > pg_num " << p->get_pg_num();
} else if (!mon->pgmon()->pg_map.creating_pgs.empty()) {
ss << "still creating pgs, wait";
ss << "busy creating pgs; try again later";
err = -EAGAIN;
} else {
pending_inc.get_new_pool(pool, p)->set_pgp_num(n);