You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2015/09/14 19:58:56 UTC
[12/16] mesos git commit: Maintenance Primitives: Added URL field to
InverseOffer protobuf.
Maintenance Primitives: Added URL field to InverseOffer protobuf.
Review: https://reviews.apache.org/r/37234
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/388eaa5b
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/388eaa5b
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/388eaa5b
Branch: refs/heads/master
Commit: 388eaa5b133c4e1b4757a26c5e4afb84ad7bf08d
Parents: e6375f3
Author: Joris Van Remoortere <jo...@gmail.com>
Authored: Sun Aug 30 14:24:16 2015 -0400
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Mon Sep 14 13:58:37 2015 -0400
----------------------------------------------------------------------
src/master/master.cpp | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/388eaa5b/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index 8ab5a03..52d5763 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -4874,6 +4874,14 @@ void Master::inverseOffer(
continue;
}
+ // TODO(bmahler): Set "https" if only "https" is supported.
+ mesos::URL url;
+ url.set_scheme("http");
+ url.mutable_address()->set_hostname(slave->info.hostname());
+ url.mutable_address()->set_ip(stringify(slave->pid.address.ip));
+ url.mutable_address()->set_port(slave->pid.address.port);
+ url.set_path("/" + slave->pid.id);
+
InverseOffer* inverseOffer = new InverseOffer();
// We use the same id generator as regular offers so that we can have unique
@@ -4882,6 +4890,7 @@ void Master::inverseOffer(
inverseOffer->mutable_id()->CopyFrom(newOfferId());
inverseOffer->mutable_framework_id()->CopyFrom(framework->id());
inverseOffer->mutable_slave_id()->CopyFrom(slave->id);
+ inverseOffer->mutable_url()->CopyFrom(url);
inverseOffer->mutable_unavailability()->CopyFrom(
unavailableResources.unavailability);