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/07/24 11:19:11 UTC
[1/2] mesos git commit: Ensured actor ID references class name in
ProtobufProcess<> instances.
Repository: mesos
Updated Branches:
refs/heads/master 64bad49eb -> 0e76bd018
Ensured actor ID references class name in ProtobufProcess<> instances.
To facilitate debugging and improve the output of
__processes__ endpoint, add a distinguishable actor
ID to to types derived from ProtobufProcess<>.
Review: https://reviews.apache.org/r/50341/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/69154956
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/69154956
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/69154956
Branch: refs/heads/master
Commit: 69154956edbebda5aa27d64be72f70c249b77905
Parents: 64bad49
Author: Alexander Rukletsov <ru...@gmail.com>
Authored: Sun Jul 24 12:58:28 2016 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Sun Jul 24 13:16:22 2016 +0200
----------------------------------------------------------------------
src/docker/executor.cpp | 4 +++-
src/health-check/health_checker.hpp | 10 ++++++----
src/launcher/executor.cpp | 4 +++-
src/log/network.hpp | 4 +++-
src/slave/status_update_manager.cpp | 5 ++++-
5 files changed, 19 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/69154956/src/docker/executor.cpp
----------------------------------------------------------------------
diff --git a/src/docker/executor.cpp b/src/docker/executor.cpp
index 0d1fd65..445628c 100644
--- a/src/docker/executor.cpp
+++ b/src/docker/executor.cpp
@@ -22,6 +22,7 @@
#include <mesos/mesos.hpp>
#include <mesos/executor.hpp>
+#include <process/id.hpp>
#include <process/process.hpp>
#include <process/protobuf.hpp>
#include <process/subprocess.hpp>
@@ -83,7 +84,8 @@ public:
const Duration& shutdownGracePeriod,
const string& healthCheckDir,
const map<string, string>& taskEnvironment)
- : killed(false),
+ : ProcessBase(ID::generate("docker-executor")),
+ killed(false),
killedByHealthCheck(false),
terminated(false),
healthPid(-1),
http://git-wip-us.apache.org/repos/asf/mesos/blob/69154956/src/health-check/health_checker.hpp
----------------------------------------------------------------------
diff --git a/src/health-check/health_checker.hpp b/src/health-check/health_checker.hpp
index f61e80d..b28a9cf 100644
--- a/src/health-check/health_checker.hpp
+++ b/src/health-check/health_checker.hpp
@@ -31,6 +31,7 @@
#include <process/delay.hpp>
#include <process/future.hpp>
+#include <process/id.hpp>
#include <process/pid.hpp>
#include <process/process.hpp>
#include <process/protobuf.hpp>
@@ -87,10 +88,11 @@ class HealthCheckerProcess : public ProtobufProcess<HealthCheckerProcess>
{
public:
HealthCheckerProcess(
- const HealthCheck& _check,
- const UPID& _executor,
- const TaskID& _taskID)
- : check(_check),
+ const HealthCheck& _check,
+ const UPID& _executor,
+ const TaskID& _taskID)
+ : ProcessBase(process::ID::generate("health-checker")),
+ check(_check),
initializing(true),
executor(_executor),
taskID(_taskID),
http://git-wip-us.apache.org/repos/asf/mesos/blob/69154956/src/launcher/executor.cpp
----------------------------------------------------------------------
diff --git a/src/launcher/executor.cpp b/src/launcher/executor.cpp
index 5a5f95f..b775931 100644
--- a/src/launcher/executor.cpp
+++ b/src/launcher/executor.cpp
@@ -37,6 +37,7 @@
#include <process/defer.hpp>
#include <process/delay.hpp>
#include <process/future.hpp>
+#include <process/id.hpp>
#include <process/io.hpp>
#include <process/process.hpp>
#include <process/protobuf.hpp>
@@ -143,7 +144,8 @@ public:
const FrameworkID& _frameworkId,
const ExecutorID& _executorId,
const Duration& _shutdownGracePeriod)
- : state(DISCONNECTED),
+ : ProcessBase(process::ID::generate("command-executor")),
+ state(DISCONNECTED),
launched(false),
killed(false),
killedByHealthCheck(false),
http://git-wip-us.apache.org/repos/asf/mesos/blob/69154956/src/log/network.hpp
----------------------------------------------------------------------
diff --git a/src/log/network.hpp b/src/log/network.hpp
index 34843c9..8750880 100644
--- a/src/log/network.hpp
+++ b/src/log/network.hpp
@@ -28,6 +28,7 @@
#include <process/collect.hpp>
#include <process/executor.hpp>
+#include <process/id.hpp>
#include <process/protobuf.hpp>
#include <stout/duration.hpp>
@@ -147,9 +148,10 @@ private:
class NetworkProcess : public ProtobufProcess<NetworkProcess>
{
public:
- NetworkProcess() {}
+ NetworkProcess() : ProcessBase(process::ID::generate("log-network")) {}
explicit NetworkProcess(const std::set<process::UPID>& pids)
+ : ProcessBase(process::ID::generate("log-network"))
{
set(pids);
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/69154956/src/slave/status_update_manager.cpp
----------------------------------------------------------------------
diff --git a/src/slave/status_update_manager.cpp b/src/slave/status_update_manager.cpp
index 5caa2aa..9d16e0d 100644
--- a/src/slave/status_update_manager.cpp
+++ b/src/slave/status_update_manager.cpp
@@ -15,6 +15,7 @@
// limitations under the License.
#include <process/delay.hpp>
+#include <process/id.hpp>
#include <process/process.hpp>
#include <process/timer.hpp>
@@ -148,7 +149,9 @@ private:
StatusUpdateManagerProcess::StatusUpdateManagerProcess(const Flags& _flags)
- : flags(_flags), paused(false) {}
+ : ProcessBase(process::ID::generate("status-update-manager")),
+ flags(_flags),
+ paused(false) {}
StatusUpdateManagerProcess::~StatusUpdateManagerProcess()
[2/2] mesos git commit: Tweaked LocalAuthorizerProcess actor ID for
clarity.
Posted by al...@apache.org.
Tweaked LocalAuthorizerProcess actor ID for clarity.
Review: https://reviews.apache.org/r/50342/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0e76bd01
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0e76bd01
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0e76bd01
Branch: refs/heads/master
Commit: 0e76bd0187966a24414fc49287b28f3231150784
Parents: 6915495
Author: Alexander Rukletsov <ru...@gmail.com>
Authored: Sun Jul 24 12:58:38 2016 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Sun Jul 24 13:16:28 2016 +0200
----------------------------------------------------------------------
src/authorizer/local/authorizer.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/0e76bd01/src/authorizer/local/authorizer.cpp
----------------------------------------------------------------------
diff --git a/src/authorizer/local/authorizer.cpp b/src/authorizer/local/authorizer.cpp
index f979e83..e410cc5 100644
--- a/src/authorizer/local/authorizer.cpp
+++ b/src/authorizer/local/authorizer.cpp
@@ -403,7 +403,7 @@ class LocalAuthorizerProcess : public ProtobufProcess<LocalAuthorizerProcess>
{
public:
LocalAuthorizerProcess(const ACLs& _acls)
- : ProcessBase(process::ID::generate("authorizer")), acls(_acls) {}
+ : ProcessBase(process::ID::generate("local-authorizer")), acls(_acls) {}
virtual void initialize()
{