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/03/31 15:46:20 UTC
mesos git commit: Revert "WIP: mesos-execute."
Repository: mesos
Updated Branches:
refs/heads/master a3d29b9c4 -> c50081f5b
Revert "WIP: mesos-execute."
This reverts commit c0f6ae86e69f4a8f4735407d3b0134672b0f531f.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c50081f5
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c50081f5
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c50081f5
Branch: refs/heads/master
Commit: c50081f5b82397c961fe0644a04496323b501b0e
Parents: a3d29b9
Author: Alexander Rukletsov <al...@apache.org>
Authored: Thu Mar 31 15:45:40 2016 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Thu Mar 31 15:45:40 2016 +0200
----------------------------------------------------------------------
src/cli/execute.cpp | 31 -------------------------------
1 file changed, 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/c50081f5/src/cli/execute.cpp
----------------------------------------------------------------------
diff --git a/src/cli/execute.cpp b/src/cli/execute.cpp
index 7ced232..af62f41 100644
--- a/src/cli/execute.cpp
+++ b/src/cli/execute.cpp
@@ -262,15 +262,6 @@ protected:
task.mutable_agent_id()->MergeFrom(offer.agent_id());
task.mutable_resources()->CopyFrom(TASK_RESOURCES.get());
-
- // Inject `KillPolicy` for testing.
- task.mutable_kill_policy()->mutable_grace_period()->
- set_nanoseconds(Seconds(11).ns());
-
-
-
-
-
CommandInfo* commandInfo = task.mutable_command();
if (shell) {
@@ -280,12 +271,7 @@ protected:
commandInfo->set_value(command.get());
} else {
// TODO(gilbert): Treat 'command' as executable value and arguments.
- // TODO(alexr): Add support for arguments.
-
commandInfo->set_shell(false);
-
- commandInfo->set_value(command.get());
- commandInfo->add_arguments()->assign(command.get());
}
if (environment.isSome()) {
@@ -426,23 +412,6 @@ protected:
cout << "Received status update " << status.state()
<< " for task " << status.task_id() << endl;
-
- if (mesos::v1::TASK_RUNNING == status.state()) {
- Call call;
- call.set_type(Call::KILL);
-
- CHECK(frameworkInfo.has_id());
- call.mutable_framework_id()->CopyFrom(frameworkInfo.id());
-
- Call::Kill* kill = call.mutable_kill();
- kill->mutable_task_id()->CopyFrom(status.task_id());
- kill->mutable_agent_id()->CopyFrom(status.agent_id());
-
- mesos->send(call);
- }
-
-
-
if (status.has_uuid()) {
Call call;
call.set_type(Call::ACKNOWLEDGE);