You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2016/03/15 23:49:53 UTC
[1/3] mesos git commit: Updated the docker executor comment.
Repository: mesos
Updated Branches:
refs/heads/master a0c225418 -> 37958fd70
Updated the docker executor comment.
Review: https://reviews.apache.org/r/44659/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5d00c383
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5d00c383
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5d00c383
Branch: refs/heads/master
Commit: 5d00c3832921c3632cdd5c7d4644044e886b870d
Parents: a0c2254
Author: Alexander Rukletsov <ru...@gmail.com>
Authored: Tue Mar 15 15:37:37 2016 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Tue Mar 15 15:37:37 2016 -0700
----------------------------------------------------------------------
src/docker/executor.cpp | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/5d00c383/src/docker/executor.cpp
----------------------------------------------------------------------
diff --git a/src/docker/executor.cpp b/src/docker/executor.cpp
index 1921d4a..afc769d 100644
--- a/src/docker/executor.cpp
+++ b/src/docker/executor.cpp
@@ -57,13 +57,11 @@ namespace docker {
const Duration DOCKER_INSPECT_DELAY = Milliseconds(500);
const Duration DOCKER_INSPECT_TIMEOUT = Seconds(5);
-// Executor that is responsible to execute a docker container, and
-// redirect log output to configured stdout and stderr files.
-// Similar to the CommandExecutor, it is only responsible to launch
-// one container and exits afterwards.
-// The executor assumes that it is launched from the
-// DockerContainerizer, which already sets up when launching the
-// executor that ensures its kept running if the slave exits.
+// Executor that is responsible to execute a docker container and
+// redirect log output to configured stdout and stderr files. Similar
+// to `CommandExecutor`, it launches a single task (a docker container)
+// and exits after the task finishes or is killed. The executor assumes
+// that it is launched from the `DockerContainerizer`.
class DockerExecutorProcess : public ProtobufProcess<DockerExecutorProcess>
{
public:
[3/3] mesos git commit: Avoided use of uint32_t for size constants.
Posted by bm...@apache.org.
Avoided use of uint32_t for size constants.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/37958fd7
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/37958fd7
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/37958fd7
Branch: refs/heads/master
Commit: 37958fd70de1998e6c29b643abd4f43dd1ef4c79
Parents: 84470c4
Author: Benjamin Mahler <bm...@apache.org>
Authored: Tue Mar 15 15:42:58 2016 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Tue Mar 15 15:42:58 2016 -0700
----------------------------------------------------------------------
src/master/constants.hpp | 2 +-
src/slave/constants.hpp | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/37958fd7/src/master/constants.hpp
----------------------------------------------------------------------
diff --git a/src/master/constants.hpp b/src/master/constants.hpp
index a188da3..12a1fd7 100644
--- a/src/master/constants.hpp
+++ b/src/master/constants.hpp
@@ -89,7 +89,7 @@ constexpr size_t DEFAULT_MAX_COMPLETED_TASKS_PER_FRAMEWORK = 1000;
constexpr Duration WHITELIST_WATCH_INTERVAL = Seconds(5);
// Default number of tasks (limit) for /master/tasks endpoint.
-constexpr uint32_t TASK_LIMIT = 100;
+constexpr size_t TASK_LIMIT = 100;
/**
* Label used by the Leader Contender and Detector.
http://git-wip-us.apache.org/repos/asf/mesos/blob/37958fd7/src/slave/constants.hpp
----------------------------------------------------------------------
diff --git a/src/slave/constants.hpp b/src/slave/constants.hpp
index 894ec73..4189c07 100644
--- a/src/slave/constants.hpp
+++ b/src/slave/constants.hpp
@@ -60,13 +60,13 @@ constexpr Duration DISK_WATCH_INTERVAL = Minutes(1);
constexpr double GC_DISK_HEADROOM = 0.1;
// Maximum number of completed frameworks to store in memory.
-constexpr uint32_t MAX_COMPLETED_FRAMEWORKS = 50;
+constexpr size_t MAX_COMPLETED_FRAMEWORKS = 50;
// Maximum number of completed executors per framework to store in memory.
-constexpr uint32_t MAX_COMPLETED_EXECUTORS_PER_FRAMEWORK = 150;
+constexpr size_t MAX_COMPLETED_EXECUTORS_PER_FRAMEWORK = 150;
// Maximum number of completed tasks per executor to store in memory.
-constexpr uint32_t MAX_COMPLETED_TASKS_PER_EXECUTOR = 200;
+constexpr size_t MAX_COMPLETED_TASKS_PER_EXECUTOR = 200;
// Default cpus offered by the slave.
constexpr double DEFAULT_CPUS = 1;
[2/3] mesos git commit: Fixed signed / unsigned comparison in
docker.cpp.
Posted by bm...@apache.org.
Fixed signed / unsigned comparison in docker.cpp.
Review: https://reviews.apache.org/r/44708/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/84470c43
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/84470c43
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/84470c43
Branch: refs/heads/master
Commit: 84470c43afb537d1bde08f83298794d9bdecf324
Parents: 5d00c38
Author: Alexander Rukletsov <ru...@gmail.com>
Authored: Tue Mar 15 15:40:24 2016 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Tue Mar 15 15:42:01 2016 -0700
----------------------------------------------------------------------
src/slave/constants.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/84470c43/src/slave/constants.hpp
----------------------------------------------------------------------
diff --git a/src/slave/constants.hpp b/src/slave/constants.hpp
index 0b4e41b..894ec73 100644
--- a/src/slave/constants.hpp
+++ b/src/slave/constants.hpp
@@ -101,7 +101,7 @@ constexpr Duration DOCKER_INSPECT_DELAY = Seconds(1);
// Default maximum number of docker inspect calls docker ps will invoke
// in parallel to prevent hitting system's open file descriptor limit.
-constexpr int DOCKER_PS_MAX_INSPECT_CALLS = 100;
+constexpr size_t DOCKER_PS_MAX_INSPECT_CALLS = 100;
// Default duration that docker containerizer will wait to check
// docker version.