You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by mp...@apache.org on 2017/11/06 22:09:57 UTC
[2/7] mesos git commit: MesosTidy: Added braces around statements.
MesosTidy: Added braces around statements.
```
src/slave/containerizer/containerizer.cpp:94:35: warning: statement
should be inside braces [google-readability-braces-around-statements]
```
Review: https://reviews.apache.org/r/63566
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/02bfc1be
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/02bfc1be
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/02bfc1be
Branch: refs/heads/master
Commit: 02bfc1bef13136f3a8958f191215b2792f8ed02c
Parents: 6fd1399
Author: Michael Park <mp...@apache.org>
Authored: Sun Nov 5 00:07:45 2017 -0700
Committer: Michael Park <mp...@apache.org>
Committed: Mon Nov 6 13:57:04 2017 -0800
----------------------------------------------------------------------
src/examples/docker_no_executor_framework.cpp | 6 ++++--
src/slave/containerizer/containerizer.cpp | 9 +++++----
2 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/02bfc1be/src/examples/docker_no_executor_framework.cpp
----------------------------------------------------------------------
diff --git a/src/examples/docker_no_executor_framework.cpp b/src/examples/docker_no_executor_framework.cpp
index 8e1844e..1fa408d 100644
--- a/src/examples/docker_no_executor_framework.cpp
+++ b/src/examples/docker_no_executor_framework.cpp
@@ -143,11 +143,13 @@ public:
cout << "Task " << taskId << " is in state " << status.state() << endl;
- if (status.state() == TASK_FINISHED)
+ if (status.state() == TASK_FINISHED) {
tasksFinished++;
+ }
- if (tasksFinished == totalTasks)
+ if (tasksFinished == totalTasks) {
driver->stop();
+ }
}
virtual void frameworkMessage(SchedulerDriver* driver,
http://git-wip-us.apache.org/repos/asf/mesos/blob/02bfc1be/src/slave/containerizer/containerizer.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/containerizer.cpp b/src/slave/containerizer/containerizer.cpp
index 15ae0b3..935dfc9 100644
--- a/src/slave/containerizer/containerizer.cpp
+++ b/src/slave/containerizer/containerizer.cpp
@@ -91,14 +91,15 @@ Try<Resources> Containerizer::resources(const Flags& flags)
bool hasPorts = false;
foreach (const Resource& resource, resourceList) {
- if (resource.name() == "cpus")
+ if (resource.name() == "cpus") {
hasCpus = true;
- else if (resource.name() == "mem")
+ } else if (resource.name() == "mem") {
hasMem = true;
- else if (resource.name() == "disk")
+ } else if (resource.name() == "disk") {
hasDisk = true;
- else if (resource.name() == "ports")
+ } else if (resource.name() == "ports") {
hasPorts = true;
+ }
}
if (!hasCpus) {