You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by al...@apache.org on 2016/08/13 01:46:09 UTC
[5/6] mesos git commit: Wrapped `HealthChecker` into `health`
namespace.
Wrapped `HealthChecker` into `health` namespace.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/95361781
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/95361781
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/95361781
Branch: refs/heads/master
Commit: 953617819cfd8e83e44850af0c7872f83fefa9e8
Parents: 23aa2f4
Author: Alexander Rukletsov <al...@apache.org>
Authored: Sat Aug 13 03:39:24 2016 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Sat Aug 13 03:43:19 2016 +0200
----------------------------------------------------------------------
src/docker/executor.cpp | 3 +--
src/health-check/health_checker.cpp | 2 ++
src/health-check/health_checker.hpp | 2 ++
src/health-check/main.cpp | 4 ++--
src/launcher/executor.cpp | 11 ++++++-----
src/master/validation.cpp | 3 +--
src/tests/health_check_tests.cpp | 2 +-
7 files changed, 15 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/95361781/src/docker/executor.cpp
----------------------------------------------------------------------
diff --git a/src/docker/executor.cpp b/src/docker/executor.cpp
index 0b58a64..ba70749 100644
--- a/src/docker/executor.cpp
+++ b/src/docker/executor.cpp
@@ -482,8 +482,7 @@ private:
HealthCheck healthCheck = task.health_check();
// Validate the `HealthCheck` protobuf.
- Option<Error> validateCheck =
- mesos::internal::validation::healthCheck(healthCheck);
+ Option<Error> validateCheck = health::validation::healthCheck(healthCheck);
if (validateCheck.isSome()) {
cerr << "Unable to launch health check process: "
http://git-wip-us.apache.org/repos/asf/mesos/blob/95361781/src/health-check/health_checker.cpp
----------------------------------------------------------------------
diff --git a/src/health-check/health_checker.cpp b/src/health-check/health_checker.cpp
index becf145..45a5fe0 100644
--- a/src/health-check/health_checker.cpp
+++ b/src/health-check/health_checker.cpp
@@ -59,6 +59,7 @@ using std::vector;
namespace mesos {
namespace internal {
+namespace health {
Try<Owned<HealthChecker>> HealthChecker::create(
const HealthCheck& check,
@@ -377,5 +378,6 @@ Option<Error> healthCheck(const HealthCheck& check)
} // namespace validation {
+} // namespace health {
} // namespace internal {
} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/95361781/src/health-check/health_checker.hpp
----------------------------------------------------------------------
diff --git a/src/health-check/health_checker.hpp b/src/health-check/health_checker.hpp
index 00a14c6..b4548f3 100644
--- a/src/health-check/health_checker.hpp
+++ b/src/health-check/health_checker.hpp
@@ -34,6 +34,7 @@
namespace mesos {
namespace internal {
+namespace health {
// Forward declarations.
class HealthCheckerProcess;
@@ -97,6 +98,7 @@ Option<Error> healthCheck(const HealthCheck& check);
} // namespace validation {
+} // namespace health {
} // namespace internal {
} // namespace mesos {
http://git-wip-us.apache.org/repos/asf/mesos/blob/95361781/src/health-check/main.cpp
----------------------------------------------------------------------
diff --git a/src/health-check/main.cpp b/src/health-check/main.cpp
index 0b13926..5346e30 100644
--- a/src/health-check/main.cpp
+++ b/src/health-check/main.cpp
@@ -151,7 +151,7 @@ int main(int argc, char** argv)
TaskID taskID;
taskID.set_value(flags.task_id.get());
- mesos::internal::HealthCheckerProcess process(
+ mesos::internal::health::HealthCheckerProcess process(
check.get(),
flags.executor.get(),
taskID);
@@ -160,7 +160,7 @@ int main(int argc, char** argv)
process::Future<Nothing> checking =
process::dispatch(
- process, &mesos::internal::HealthCheckerProcess::healthCheck);
+ process, &mesos::internal::health::HealthCheckerProcess::healthCheck);
checking.await();
http://git-wip-us.apache.org/repos/asf/mesos/blob/95361781/src/launcher/executor.cpp
----------------------------------------------------------------------
diff --git a/src/launcher/executor.cpp b/src/launcher/executor.cpp
index 7967684..2d04edb 100644
--- a/src/launcher/executor.cpp
+++ b/src/launcher/executor.cpp
@@ -409,10 +409,11 @@ protected:
cout << "Forked command at " << pid << endl;
if (task->has_health_check()) {
- Try<Owned<HealthChecker>> _checker = HealthChecker::create(
- task->health_check(),
- self(),
- task->task_id());
+ Try<Owned<health::HealthChecker>> _checker =
+ health::HealthChecker::create(
+ task->health_check(),
+ self(),
+ task->task_id());
if (_checker.isError()) {
// TODO(gilbert): Consider ABORT and return a TASK_FAILED here.
@@ -745,7 +746,7 @@ private:
Owned<MesosBase> mesos;
LinkedHashMap<UUID, Call::Update> updates; // Unacknowledged updates.
Option<TaskInfo> task; // Unacknowledged task.
- Owned<HealthChecker> checker;
+ Owned<health::HealthChecker> checker;
};
} // namespace internal {
http://git-wip-us.apache.org/repos/asf/mesos/blob/95361781/src/master/validation.cpp
----------------------------------------------------------------------
diff --git a/src/master/validation.cpp b/src/master/validation.cpp
index 7884191..52d9137 100644
--- a/src/master/validation.cpp
+++ b/src/master/validation.cpp
@@ -741,8 +741,7 @@ Option<Error> validateKillPolicy(const TaskInfo& task)
Option<Error> validateHealthCheck(const TaskInfo& task)
{
if (task.has_health_check()) {
- Option<Error> error =
- mesos::internal::validation::healthCheck(task.health_check());
+ Option<Error> error = health::validation::healthCheck(task.health_check());
if (error.isSome()) {
return Error("Task uses invalid health check: " + error.get().message);
http://git-wip-us.apache.org/repos/asf/mesos/blob/95361781/src/tests/health_check_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/health_check_tests.cpp b/src/tests/health_check_tests.cpp
index 9de8563..e69c4f5 100644
--- a/src/tests/health_check_tests.cpp
+++ b/src/tests/health_check_tests.cpp
@@ -164,7 +164,7 @@ public:
// This tests ensures `HealthCheck` protobuf is validated correctly.
TEST_F(HealthCheckTest, HealthCheckProtobufValidation)
{
- using namespace mesos::internal;
+ using namespace mesos::internal::health;
// Health check type must be set to a known value.
{