You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/02/04 01:32:04 UTC
[1/2] mesos git commit: Fixed non-camel case in protobuf field.
Repository: mesos
Updated Branches:
refs/heads/master 0df2fe3d9 -> 089e08c2c
Fixed non-camel case in protobuf field.
Review: https://reviews.apache.org/r/43019/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/21a1d499
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/21a1d499
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/21a1d499
Branch: refs/heads/master
Commit: 21a1d4994cabb4b8197e08a09e5490ca9310044f
Parents: 0df2fe3
Author: Gilbert Song <so...@gmail.com>
Authored: Wed Feb 3 15:38:59 2016 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Feb 3 15:54:15 2016 -0800
----------------------------------------------------------------------
include/mesos/slave/isolator.proto | 10 +++++--
src/slave/containerizer/mesos/containerizer.cpp | 8 ++++++
.../mesos/isolators/cgroups/cpushare.cpp | 2 +-
.../mesos/isolators/cgroups/mem.cpp | 2 +-
.../mesos/isolators/cgroups/net_cls.cpp | 2 +-
.../mesos/isolators/filesystem/linux.cpp | 2 +-
.../mesos/isolators/filesystem/posix.cpp | 2 +-
.../mesos/isolators/filesystem/shared.cpp | 2 +-
.../mesos/isolators/network/port_mapping.cpp | 2 +-
src/tests/containerizer/isolator_tests.cpp | 22 +++++++--------
src/tests/containerizer/port_mapping_tests.cpp | 28 ++++++++++----------
11 files changed, 48 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/21a1d499/include/mesos/slave/isolator.proto
----------------------------------------------------------------------
diff --git a/include/mesos/slave/isolator.proto b/include/mesos/slave/isolator.proto
index 8b7c54a..0e2dd9b 100644
--- a/include/mesos/slave/isolator.proto
+++ b/include/mesos/slave/isolator.proto
@@ -68,8 +68,8 @@ message ContainerState
* during `prepare`.
*/
message ContainerConfig {
- required ExecutorInfo executorInfo = 1;
- optional TaskInfo taskInfo = 2;
+ required ExecutorInfo executor_info = 8;
+ optional TaskInfo task_info = 9;
// The work directory for the container in the host filesystem.
required string directory = 3;
@@ -88,6 +88,12 @@ message ContainerConfig {
optional Docker docker = 7;
// TODO(gilbert): Add appc image manifest.
+
+ // The following two fields are deprecated. Please do NOT use them
+ // in your isolator. Use 'executor_info' and 'task_info' instead.
+ // TODO(gilbert): Remove them in 0.29.
+ required ExecutorInfo executorInfo = 1;
+ optional TaskInfo taskInfo = 2;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/21a1d499/src/slave/containerizer/mesos/containerizer.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/containerizer.cpp b/src/slave/containerizer/mesos/containerizer.cpp
index 4b504db..12fab74 100644
--- a/src/slave/containerizer/mesos/containerizer.cpp
+++ b/src/slave/containerizer/mesos/containerizer.cpp
@@ -804,9 +804,17 @@ Future<list<Option<ContainerLaunchInfo>>> MesosContainerizerProcess::prepare(
// Construct ContainerConfig.
ContainerConfig containerConfig;
containerConfig.set_directory(directory);
+ containerConfig.mutable_executor_info()->CopyFrom(executorInfo);
+
+ // TODO(gilbert): Remove this in 0.29.0. The camel case protobuf
+ // field 'executorInfo' will be deprecated and removed in 0.29.0.
containerConfig.mutable_executorinfo()->CopyFrom(executorInfo);
if (taskInfo.isSome()) {
+ containerConfig.mutable_task_info()->CopyFrom(taskInfo.get());
+
+ // TODO(gilbert): Remove this in 0.29.0. The camel case protobuf
+ // field 'taskInfo' will be deprecated and removed in 0.29.0.
containerConfig.mutable_taskinfo()->CopyFrom(taskInfo.get());
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/21a1d499/src/slave/containerizer/mesos/isolators/cgroups/cpushare.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/cgroups/cpushare.cpp b/src/slave/containerizer/mesos/isolators/cgroups/cpushare.cpp
index 57168c8..52d3ddc 100644
--- a/src/slave/containerizer/mesos/isolators/cgroups/cpushare.cpp
+++ b/src/slave/containerizer/mesos/isolators/cgroups/cpushare.cpp
@@ -288,7 +288,7 @@ Future<Option<ContainerLaunchInfo>> CgroupsCpushareIsolatorProcess::prepare(
}
}
- return update(containerId, containerConfig.executorinfo().resources())
+ return update(containerId, containerConfig.executor_info().resources())
.then([]() -> Future<Option<ContainerLaunchInfo>> {
return None();
});
http://git-wip-us.apache.org/repos/asf/mesos/blob/21a1d499/src/slave/containerizer/mesos/isolators/cgroups/mem.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/cgroups/mem.cpp b/src/slave/containerizer/mesos/isolators/cgroups/mem.cpp
index 34aa660..680cdc7 100644
--- a/src/slave/containerizer/mesos/isolators/cgroups/mem.cpp
+++ b/src/slave/containerizer/mesos/isolators/cgroups/mem.cpp
@@ -278,7 +278,7 @@ Future<Option<ContainerLaunchInfo>> CgroupsMemIsolatorProcess::prepare(
oomListen(containerId);
pressureListen(containerId);
- return update(containerId, containerConfig.executorinfo().resources())
+ return update(containerId, containerConfig.executor_info().resources())
.then([]() -> Future<Option<ContainerLaunchInfo>> {
return None();
});
http://git-wip-us.apache.org/repos/asf/mesos/blob/21a1d499/src/slave/containerizer/mesos/isolators/cgroups/net_cls.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/cgroups/net_cls.cpp b/src/slave/containerizer/mesos/isolators/cgroups/net_cls.cpp
index ddc1bf0..8821ccd 100644
--- a/src/slave/containerizer/mesos/isolators/cgroups/net_cls.cpp
+++ b/src/slave/containerizer/mesos/isolators/cgroups/net_cls.cpp
@@ -236,7 +236,7 @@ Future<Option<ContainerLaunchInfo>> CgroupsNetClsIsolatorProcess::prepare(
infos.emplace(containerId, info);
- return update(containerId, containerConfig.executorinfo().resources())
+ return update(containerId, containerConfig.executor_info().resources())
.then([]() -> Future<Option<ContainerLaunchInfo>> {
return None();
});
http://git-wip-us.apache.org/repos/asf/mesos/blob/21a1d499/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp b/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp
index 24ff819..b9615be 100644
--- a/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp
+++ b/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp
@@ -348,7 +348,7 @@ Future<Option<ContainerLaunchInfo>> LinuxFilesystemIsolatorProcess::prepare(
launchInfo.set_rootfs(rootfs);
}
- const ExecutorInfo& executorInfo = containerConfig.executorinfo();
+ const ExecutorInfo& executorInfo = containerConfig.executor_info();
// Prepare the commands that will be run in the container's mount
// namespace right after forking the executor process. We use these
http://git-wip-us.apache.org/repos/asf/mesos/blob/21a1d499/src/slave/containerizer/mesos/isolators/filesystem/posix.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/filesystem/posix.cpp b/src/slave/containerizer/mesos/isolators/filesystem/posix.cpp
index bce5ab9..01c0ad6 100644
--- a/src/slave/containerizer/mesos/isolators/filesystem/posix.cpp
+++ b/src/slave/containerizer/mesos/isolators/filesystem/posix.cpp
@@ -77,7 +77,7 @@ Future<Option<ContainerLaunchInfo>> PosixFilesystemIsolatorProcess::prepare(
return Failure("Container has already been prepared");
}
- const ExecutorInfo& executorInfo = containerConfig.executorinfo();
+ const ExecutorInfo& executorInfo = containerConfig.executor_info();
if (executorInfo.has_container()) {
CHECK_EQ(executorInfo.container().type(), ContainerInfo::MESOS);
http://git-wip-us.apache.org/repos/asf/mesos/blob/21a1d499/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp b/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp
index 59ffd13..9ae4d93 100644
--- a/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp
+++ b/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp
@@ -79,7 +79,7 @@ Future<Option<ContainerLaunchInfo>> SharedFilesystemIsolatorProcess::prepare(
const ContainerID& containerId,
const ContainerConfig& containerConfig)
{
- const ExecutorInfo& executorInfo = containerConfig.executorinfo();
+ const ExecutorInfo& executorInfo = containerConfig.executor_info();
if (executorInfo.has_container() &&
executorInfo.container().type() != ContainerInfo::MESOS) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/21a1d499/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
index d5dd93d..1c2fbe9 100644
--- a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
+++ b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
@@ -2119,7 +2119,7 @@ Future<Option<ContainerLaunchInfo>> PortMappingIsolatorProcess::prepare(
return Failure("Container has already been prepared");
}
- const ExecutorInfo& executorInfo = containerConfig.executorinfo();
+ const ExecutorInfo& executorInfo = containerConfig.executor_info();
Resources resources(executorInfo.resources());
http://git-wip-us.apache.org/repos/asf/mesos/blob/21a1d499/src/tests/containerizer/isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/isolator_tests.cpp b/src/tests/containerizer/isolator_tests.cpp
index 8d101df..67322ab 100644
--- a/src/tests/containerizer/isolator_tests.cpp
+++ b/src/tests/containerizer/isolator_tests.cpp
@@ -166,7 +166,7 @@ TYPED_TEST(CpuIsolatorTest, UserCpuUsage)
ASSERT_SOME(dir);
ContainerConfig containerConfig;
- containerConfig.mutable_executorinfo()->CopyFrom(executorInfo);
+ containerConfig.mutable_executor_info()->CopyFrom(executorInfo);
containerConfig.set_directory(dir.get());
AWAIT_READY(isolator.get()->prepare(
@@ -278,7 +278,7 @@ TYPED_TEST(CpuIsolatorTest, SystemCpuUsage)
ASSERT_SOME(dir);
ContainerConfig containerConfig;
- containerConfig.mutable_executorinfo()->CopyFrom(executorInfo);
+ containerConfig.mutable_executor_info()->CopyFrom(executorInfo);
containerConfig.set_directory(dir.get());
AWAIT_READY(isolator.get()->prepare(
@@ -392,7 +392,7 @@ TEST_F(RevocableCpuIsolatorTest, ROOT_CGROUPS_RevocableCpu)
containerId.set_value(UUID::random().toString());
ContainerConfig containerConfig;
- containerConfig.mutable_executorinfo()->CopyFrom(executorInfo);
+ containerConfig.mutable_executor_info()->CopyFrom(executorInfo);
containerConfig.set_directory(os::getcwd());
AWAIT_READY(isolator.get()->prepare(
@@ -474,7 +474,7 @@ TEST_F(LimitedCpuIsolatorTest, ROOT_CGROUPS_CFS_Enable_Cfs)
ASSERT_SOME(dir);
ContainerConfig containerConfig;
- containerConfig.mutable_executorinfo()->CopyFrom(executorInfo);
+ containerConfig.mutable_executor_info()->CopyFrom(executorInfo);
containerConfig.set_directory(dir.get());
Future<Option<ContainerLaunchInfo>> prepare =
@@ -590,7 +590,7 @@ TEST_F(LimitedCpuIsolatorTest, ROOT_CGROUPS_CFS_Big_Quota)
ASSERT_SOME(dir);
ContainerConfig containerConfig;
- containerConfig.mutable_executorinfo()->CopyFrom(executorInfo);
+ containerConfig.mutable_executor_info()->CopyFrom(executorInfo);
containerConfig.set_directory(dir.get());
Future<Option<ContainerLaunchInfo>> prepare =
@@ -678,7 +678,7 @@ TEST_F(LimitedCpuIsolatorTest, ROOT_CGROUPS_Pids_and_Tids)
ASSERT_SOME(dir);
ContainerConfig containerConfig;
- containerConfig.mutable_executorinfo()->CopyFrom(executorInfo);
+ containerConfig.mutable_executor_info()->CopyFrom(executorInfo);
containerConfig.set_directory(dir.get());
Future<Option<ContainerLaunchInfo>> prepare =
@@ -805,7 +805,7 @@ TYPED_TEST(MemIsolatorTest, MemUsage)
ASSERT_SOME(dir);
ContainerConfig containerConfig;
- containerConfig.mutable_executorinfo()->CopyFrom(executorInfo);
+ containerConfig.mutable_executor_info()->CopyFrom(executorInfo);
containerConfig.set_directory(dir.get());
AWAIT_READY(isolator.get()->prepare(
@@ -985,7 +985,7 @@ TEST_F(PerfEventIsolatorTest, ROOT_CGROUPS_Sample)
ASSERT_SOME(dir);
ContainerConfig containerConfig;
- containerConfig.mutable_executorinfo()->CopyFrom(executorInfo);
+ containerConfig.mutable_executor_info()->CopyFrom(executorInfo);
containerConfig.set_directory(dir.get());
AWAIT_READY(isolator.get()->prepare(
@@ -1082,7 +1082,7 @@ TEST_F(SharedFilesystemIsolatorTest, DISABLED_ROOT_RelativeVolume)
containerId.set_value(UUID::random().toString());
ContainerConfig containerConfig;
- containerConfig.mutable_executorinfo()->CopyFrom(executorInfo);
+ containerConfig.mutable_executor_info()->CopyFrom(executorInfo);
containerConfig.set_directory(flags.work_dir);
Future<Option<ContainerLaunchInfo> > prepare =
@@ -1189,7 +1189,7 @@ TEST_F(SharedFilesystemIsolatorTest, DISABLED_ROOT_AbsoluteVolume)
containerId.set_value(UUID::random().toString());
ContainerConfig containerConfig;
- containerConfig.mutable_executorinfo()->CopyFrom(executorInfo);
+ containerConfig.mutable_executor_info()->CopyFrom(executorInfo);
containerConfig.set_directory(flags.work_dir);
Future<Option<ContainerLaunchInfo> > prepare =
@@ -1367,7 +1367,7 @@ TYPED_TEST(UserCgroupIsolatorTest, ROOT_CGROUPS_UserCgroup)
containerId.set_value(UUID::random().toString());
ContainerConfig containerConfig;
- containerConfig.mutable_executorinfo()->CopyFrom(executorInfo);
+ containerConfig.mutable_executor_info()->CopyFrom(executorInfo);
containerConfig.set_directory(os::getcwd());
containerConfig.set_user(UNPRIVILEGED_USERNAME);
http://git-wip-us.apache.org/repos/asf/mesos/blob/21a1d499/src/tests/containerizer/port_mapping_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/port_mapping_tests.cpp b/src/tests/containerizer/port_mapping_tests.cpp
index 182fe92..fd6f063 100644
--- a/src/tests/containerizer/port_mapping_tests.cpp
+++ b/src/tests/containerizer/port_mapping_tests.cpp
@@ -457,7 +457,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_ContainerToContainerTCP)
ASSERT_SOME(dir1);
ContainerConfig containerConfig1;
- containerConfig1.mutable_executorinfo()->CopyFrom(executorInfo);
+ containerConfig1.mutable_executor_info()->CopyFrom(executorInfo);
containerConfig1.set_directory(dir1.get());
Future<Option<ContainerLaunchInfo>> launchInfo1 =
@@ -526,7 +526,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_ContainerToContainerTCP)
ASSERT_SOME(dir2);
ContainerConfig containerConfig2;
- containerConfig2.mutable_executorinfo()->CopyFrom(executorInfo);
+ containerConfig2.mutable_executor_info()->CopyFrom(executorInfo);
containerConfig2.set_directory(dir2.get());
Future<Option<ContainerLaunchInfo>> launchInfo2 =
@@ -620,7 +620,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_ContainerToContainerUDP)
ASSERT_SOME(dir1);
ContainerConfig containerConfig1;
- containerConfig1.mutable_executorinfo()->CopyFrom(executorInfo);
+ containerConfig1.mutable_executor_info()->CopyFrom(executorInfo);
containerConfig1.set_directory(dir1.get());
Future<Option<ContainerLaunchInfo>> launchInfo1 =
@@ -689,7 +689,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_ContainerToContainerUDP)
ASSERT_SOME(dir2);
ContainerConfig containerConfig2;
- containerConfig2.mutable_executorinfo()->CopyFrom(executorInfo);
+ containerConfig2.mutable_executor_info()->CopyFrom(executorInfo);
containerConfig2.set_directory(dir2.get());
Future<Option<ContainerLaunchInfo>> launchInfo2 =
@@ -785,7 +785,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_HostToContainerUDP)
ASSERT_SOME(dir);
ContainerConfig containerConfig;
- containerConfig.mutable_executorinfo()->CopyFrom(executorInfo);
+ containerConfig.mutable_executor_info()->CopyFrom(executorInfo);
containerConfig.set_directory(dir.get());
Future<Option<ContainerLaunchInfo>> launchInfo =
@@ -903,7 +903,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_HostToContainerTCP)
ASSERT_SOME(dir);
ContainerConfig containerConfig;
- containerConfig.mutable_executorinfo()->CopyFrom(executorInfo);
+ containerConfig.mutable_executor_info()->CopyFrom(executorInfo);
containerConfig.set_directory(dir.get());
Future<Option<ContainerLaunchInfo>> launchInfo =
@@ -1029,7 +1029,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_ContainerICMPExternal)
ASSERT_SOME(dir);
ContainerConfig containerConfig;
- containerConfig.mutable_executorinfo()->CopyFrom(executorInfo);
+ containerConfig.mutable_executor_info()->CopyFrom(executorInfo);
containerConfig.set_directory(dir.get());
Future<Option<ContainerLaunchInfo>> launchInfo =
@@ -1116,7 +1116,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_ContainerICMPInternal)
ASSERT_SOME(dir);
ContainerConfig containerConfig;
- containerConfig.mutable_executorinfo()->CopyFrom(executorInfo);
+ containerConfig.mutable_executor_info()->CopyFrom(executorInfo);
containerConfig.set_directory(dir.get());
Future<Option<ContainerLaunchInfo>> launchInfo =
@@ -1206,7 +1206,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_ContainerARPExternal)
ASSERT_SOME(dir);
ContainerConfig containerConfig;
- containerConfig.mutable_executorinfo()->CopyFrom(executorInfo);
+ containerConfig.mutable_executor_info()->CopyFrom(executorInfo);
containerConfig.set_directory(dir.get());
Future<Option<ContainerLaunchInfo>> launchInfo =
@@ -1302,7 +1302,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_DNS)
ASSERT_SOME(dir);
ContainerConfig containerConfig;
- containerConfig.mutable_executorinfo()->CopyFrom(executorInfo);
+ containerConfig.mutable_executor_info()->CopyFrom(executorInfo);
containerConfig.set_directory(dir.get());
Future<Option<ContainerLaunchInfo>> launchInfo =
@@ -1394,7 +1394,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_TooManyContainers)
ASSERT_SOME(dir1);
ContainerConfig containerConfig1;
- containerConfig1.mutable_executorinfo()->CopyFrom(executorInfo);
+ containerConfig1.mutable_executor_info()->CopyFrom(executorInfo);
containerConfig1.set_directory(dir1.get());
Future<Option<ContainerLaunchInfo>> launchInfo1 =
@@ -1447,7 +1447,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_TooManyContainers)
ASSERT_SOME(dir2);
ContainerConfig containerConfig2;
- containerConfig2.mutable_executorinfo()->CopyFrom(executorInfo);
+ containerConfig2.mutable_executor_info()->CopyFrom(executorInfo);
containerConfig2.set_directory(dir2.get());
Future<Option<ContainerLaunchInfo>> launchInfo2 =
@@ -1513,7 +1513,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_SmallEgressLimit)
ASSERT_SOME(dir);
ContainerConfig containerConfig;
- containerConfig.mutable_executorinfo()->CopyFrom(executorInfo);
+ containerConfig.mutable_executor_info()->CopyFrom(executorInfo);
containerConfig.set_directory(dir.get());
Future<Option<ContainerLaunchInfo>> launchInfo =
@@ -1668,7 +1668,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_PortMappingStatistics)
ASSERT_SOME(dir);
ContainerConfig containerConfig;
- containerConfig.mutable_executorinfo()->CopyFrom(executorInfo);
+ containerConfig.mutable_executor_info()->CopyFrom(executorInfo);
containerConfig.set_directory(dir.get());
Future<Option<ContainerLaunchInfo>> launchInfo =
[2/2] mesos git commit: Fixed a compiler warning in reservation test.
Posted by ji...@apache.org.
Fixed a compiler warning in reservation test.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/089e08c2
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/089e08c2
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/089e08c2
Branch: refs/heads/master
Commit: 089e08c2c09f72c1f816a5bb77fddac3778c66ec
Parents: 21a1d49
Author: Jie Yu <yu...@gmail.com>
Authored: Wed Feb 3 16:29:49 2016 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Feb 3 16:29:49 2016 -0800
----------------------------------------------------------------------
src/tests/reservation_tests.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/089e08c2/src/tests/reservation_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/reservation_tests.cpp b/src/tests/reservation_tests.cpp
index f50ac67..d2ef159 100644
--- a/src/tests/reservation_tests.cpp
+++ b/src/tests/reservation_tests.cpp
@@ -228,7 +228,7 @@ TEST_F(ReservationTest, ReserveTwiceWithDoubleValue)
AWAIT_READY(offers);
- ASSERT_EQ(1, offers.get().size());
+ ASSERT_EQ(1u, offers.get().size());
offer = offers.get()[0];
// In the second offer, expect an offer with reserved resources.