shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-23 17:33:56 +03:00
Code Releases Wiki Activity

feature #1288: Fix setting quotas with missing limits.

Browse Source
This commit is contained in:
Ruben S. Montero 2012-06-07 02:33:02 +02:00
parent a60cf1ad70
commit 3ff91211df
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/um/Quota.cc
View File

@ -226,12 +226,12 @@ bool Quota::check_quota(const string& qid,
{
ostringstream oss;
oss << "Limit (" << limit << ") reached for " << metrics[i]
<< " in quota " << template_name;
oss << "Limit of " << limit << " reached for " << metrics[i]
<< " quota in " << template_name;
if ( !qid.empty() )
{
oss << "with ID: " << qid;
oss << " with ID: " << qid;
}
error = oss.str();
@ -309,11 +309,11 @@ int Quota::update_limits(VectorAttribute * quota, const VectorAttribute * va)
{
limit = va->vector_value_str(metrics[i], limit_i);
if ( limit_i < 0 )
if ( limit_i < 0 ) //No quota, NaN or negative
{
return -1;
}
else if ( !limit.empty() )
else
{
quota->replace(metrics[i], limit);
}
@ -340,11 +340,7 @@ VectorAttribute * Quota::new_quota(VectorAttribute * va)
limit = va->vector_value_str(metrics[i], limit_i);
if ( limit_i < 0 )
{
return 0;
}
else if ( limit.empty() )
if ( limit_i < 0 ) //No quota, NaN or negative
{
limit = "0";
}