Repository: mesos Updated Branches: refs/heads/master 2cc8d6488 -> be33e9a57
Remove depreacted webui_hostname and webui_port fields from SlaveInfo. These have been deprecated since November 2013, at least Mesos 0.16. Should be safe to remove at this point (People will have to upgrade pre-0.16 to something between 0.16 and 0.20.1 inclusive, before upgrading past 0.20.1). Review: https://reviews.apache.org/r/26149 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/be33e9a5 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/be33e9a5 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/be33e9a5 Branch: refs/heads/master Commit: be33e9a57b79543ecb9374029d2c5df772059687 Parents: 2cc8d64 Author: Cody Maloney <[email protected]> Authored: Mon Sep 29 14:25:16 2014 -0700 Committer: Vinod Kone <[email protected]> Committed: Mon Sep 29 14:25:17 2014 -0700 ---------------------------------------------------------------------- include/mesos/mesos.proto | 4 ---- src/common/type_utils.cpp | 2 -- src/master/registrar.cpp | 1 - src/slave/slave.cpp | 6 ------ 4 files changed, 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/be33e9a5/include/mesos/mesos.proto ---------------------------------------------------------------------- diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto index be45494..735da53 100644 --- a/include/mesos/mesos.proto +++ b/include/mesos/mesos.proto @@ -309,10 +309,6 @@ message SlaveInfo { repeated Attribute attributes = 5; optional SlaveID id = 6; optional bool checkpoint = 7 [default = false]; - - // Deprecated! - optional string webui_hostname = 2; - optional int32 webui_port = 4 [default = 8081]; } http://git-wip-us.apache.org/repos/asf/mesos/blob/be33e9a5/src/common/type_utils.cpp ---------------------------------------------------------------------- diff --git a/src/common/type_utils.cpp b/src/common/type_utils.cpp index e55b1f9..4f8d6ec 100644 --- a/src/common/type_utils.cpp +++ b/src/common/type_utils.cpp @@ -108,8 +108,6 @@ bool operator == (const ExecutorInfo& left, const ExecutorInfo& right) bool operator == (const SlaveInfo& left, const SlaveInfo& right) { - // NOTE: We don't compare 'webui_hostname' and 'webui_port' since - // they're deprecated and do not carry any semantic meaning. return left.hostname() == right.hostname() && Resources(left.resources()) == Resources(right.resources()) && internal::Attributes(left.attributes()) == http://git-wip-us.apache.org/repos/asf/mesos/blob/be33e9a5/src/master/registrar.cpp ---------------------------------------------------------------------- diff --git a/src/master/registrar.cpp b/src/master/registrar.cpp index 3f9b9cf..ccc2fd2 100644 --- a/src/master/registrar.cpp +++ b/src/master/registrar.cpp @@ -297,7 +297,6 @@ string RegistrarProcess::registryHelp() " \"type\": \"SCALAR\"", " }", " ],", - " \"webui_hostname\": \"localhost\"", " }", " }", " ]", http://git-wip-us.apache.org/repos/asf/mesos/blob/be33e9a5/src/slave/slave.cpp ---------------------------------------------------------------------- diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp index c82d99f..e56dcbd 100644 --- a/src/slave/slave.cpp +++ b/src/slave/slave.cpp @@ -317,12 +317,6 @@ void Slave::initialize() LOG(INFO) << "Slave hostname: " << info.hostname(); LOG(INFO) << "Slave checkpoint: " << stringify(flags.checkpoint); - // The required 'webui_hostname' field has been deprecated and - // changed to optional for now, but we still need to set it for - // interoperating with code that expects it to be required (e.g., an - // executor on an older release). - // TODO(benh): Remove this after the deprecation cycle. - info.set_webui_hostname(hostname); statusUpdateManager->initialize(flags, self()); // Start disk monitoring.
