svn commit: r1370623 - in /incubator/mesos/trunk/src/slave: cgroups_isolation_module.cpp lxc_isolation_module.cpp

[be...@apache.org]

Author: benh
Date: Wed Aug  8 01:05:16 2012
New Revision: 1370623

URL: http://svn.apache.org/viewvc?rev=1370623&view=rev
Log:
Fixed a bug about the value of cpu.shares in both cgroups and LXC
isolation module (contributed by Jie Yu,
https://reviews.apache.org/r/6455).

Modified:
    incubator/mesos/trunk/src/slave/cgroups_isolation_module.cpp
    incubator/mesos/trunk/src/slave/lxc_isolation_module.cpp

Modified: incubator/mesos/trunk/src/slave/cgroups_isolation_module.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/slave/cgroups_isolation_module.cpp?rev=1370623&r1=1370622&r2=1370623&view=diff
==============================================================================
--- incubator/mesos/trunk/src/slave/cgroups_isolation_module.cpp (original)
+++ incubator/mesos/trunk/src/slave/cgroups_isolation_module.cpp Wed Aug  8 01:05:16 2012
@@ -479,7 +479,7 @@ Try<bool> CgroupsIsolationModule::cpusCh
   } else {
     double cpus = cpusResource.get().scalar().value();
     size_t cpuShares =
-      std::max(CPU_SHARES_PER_CPU * (size_t)cpus, MIN_CPU_SHARES);
+      std::max((size_t)(CPU_SHARES_PER_CPU * cpus), MIN_CPU_SHARES);
 
     Try<bool> set =
       cgroups::writeControl(hierarchy,

Modified: incubator/mesos/trunk/src/slave/lxc_isolation_module.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/slave/lxc_isolation_module.cpp?rev=1370623&r1=1370622&r2=1370623&view=diff
==============================================================================
--- incubator/mesos/trunk/src/slave/lxc_isolation_module.cpp (original)
+++ incubator/mesos/trunk/src/slave/lxc_isolation_module.cpp Wed Aug  8 01:05:16 2012
@@ -289,7 +289,7 @@ void LxcIsolationModule::resourcesChange
   uint64_t value;
 
   double cpu = resources.get("cpus", Value::Scalar()).value();
-  int32_t cpu_shares = max(CPU_SHARES_PER_CPU * (int32_t) cpu, MIN_CPU_SHARES);
+  int32_t cpu_shares = max((int32_t)(CPU_SHARES_PER_CPU * cpu), MIN_CPU_SHARES);
 
   property = "cpu.shares";
   value = cpu_shares;