You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by nn...@apache.org on 2015/10/13 02:31:54 UTC
mesos git commit: Deprecated resource_monitoring_interval flag.
Repository: mesos
Updated Branches:
refs/heads/master 3c96155a4 -> 85569a979
Deprecated resource_monitoring_interval flag.
This flag should be deprecated after 0.23.0 as it is no use now.
Review: https://reviews.apache.org/r/39205
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/85569a97
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/85569a97
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/85569a97
Branch: refs/heads/master
Commit: 85569a979e322b586f8249b6a12b4758970c4bc7
Parents: 3c96155
Author: Guangya Liu <gy...@gmail.com>
Authored: Mon Oct 12 17:03:51 2015 -0700
Committer: Niklas Q. Nielsen <ni...@qni.dk>
Committed: Mon Oct 12 17:31:44 2015 -0700
----------------------------------------------------------------------
docs/configuration.md | 9 ---------
docs/oversubscription.md | 10 ----------
src/slave/constants.cpp | 1 -
src/slave/constants.hpp | 1 -
src/slave/flags.cpp | 6 ------
src/slave/flags.hpp | 4 ----
6 files changed, 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/85569a97/docs/configuration.md
----------------------------------------------------------------------
diff --git a/docs/configuration.md b/docs/configuration.md
index 2ab476a..9443d5f 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -1389,15 +1389,6 @@ file:///path/to/file (where file contains one of the above)</code></pre>
</tr>
<tr>
<td>
- --resource_monitoring_interval=VALUE
- </td>
- <td>
- Periodic time interval for monitoring executor
- resource usage (e.g., 10secs, 1min, etc) (default: 1secs)
- </td>
- </tr>
- <tr>
- <td>
--resources=VALUE
</td>
<td>
http://git-wip-us.apache.org/repos/asf/mesos/blob/85569a97/docs/oversubscription.md
----------------------------------------------------------------------
diff --git a/docs/oversubscription.md b/docs/oversubscription.md
index 5a31b1f..7d1415a 100644
--- a/docs/oversubscription.md
+++ b/docs/oversubscription.md
@@ -269,16 +269,6 @@ between these corrections is controlled by this flag. (default: 0ns)
</td>
</tr>
- <tr>
- <td>
- --resource_monitoring_interval=VALUE
- </td>
- <td>
- Periodic time interval for monitoring executor resource usage (e.g.,
-10secs, 1min, etc) (default: 1secs)
- </td>
- </tr>
-
</table>
The `fixed` resource estimator is enabled as follows:
http://git-wip-us.apache.org/repos/asf/mesos/blob/85569a97/src/slave/constants.cpp
----------------------------------------------------------------------
diff --git a/src/slave/constants.cpp b/src/slave/constants.cpp
index cf3ee7b..96dadce 100644
--- a/src/slave/constants.cpp
+++ b/src/slave/constants.cpp
@@ -38,7 +38,6 @@ const Duration GC_DELAY = Weeks(1);
const double GC_DISK_HEADROOM = 0.1;
const Duration DISK_WATCH_INTERVAL = Minutes(1);
const Duration RECOVERY_TIMEOUT = Minutes(15);
-const Duration RESOURCE_MONITORING_INTERVAL = Seconds(1);
const uint32_t MAX_COMPLETED_FRAMEWORKS = 50;
const uint32_t MAX_COMPLETED_EXECUTORS_PER_FRAMEWORK = 150;
const uint32_t MAX_COMPLETED_TASKS_PER_EXECUTOR = 200;
http://git-wip-us.apache.org/repos/asf/mesos/blob/85569a97/src/slave/constants.hpp
----------------------------------------------------------------------
diff --git a/src/slave/constants.hpp b/src/slave/constants.hpp
index df18676..1197268 100644
--- a/src/slave/constants.hpp
+++ b/src/slave/constants.hpp
@@ -46,7 +46,6 @@ extern const Duration STATUS_UPDATE_RETRY_INTERVAL_MIN;
extern const Duration STATUS_UPDATE_RETRY_INTERVAL_MAX;
extern const Duration GC_DELAY;
extern const Duration DISK_WATCH_INTERVAL;
-extern const Duration RESOURCE_MONITORING_INTERVAL;
// Default backoff interval used by the slave to wait before registration.
extern const Duration REGISTRATION_BACKOFF_FACTOR;
http://git-wip-us.apache.org/repos/asf/mesos/blob/85569a97/src/slave/flags.cpp
----------------------------------------------------------------------
diff --git a/src/slave/flags.cpp b/src/slave/flags.cpp
index 029aa1e..ac68e1b 100644
--- a/src/slave/flags.cpp
+++ b/src/slave/flags.cpp
@@ -242,12 +242,6 @@ mesos::internal::slave::Flags::Flags()
"information and sandboxes.",
DISK_WATCH_INTERVAL);
- add(&Flags::resource_monitoring_interval,
- "resource_monitoring_interval",
- "Periodic time interval for monitoring executor\n"
- "resource usage (e.g., 10secs, 1min, etc)",
- RESOURCE_MONITORING_INTERVAL);
-
add(&Flags::recover,
"recover",
"Whether to recover status updates and reconnect with old executors.\n"
http://git-wip-us.apache.org/repos/asf/mesos/blob/85569a97/src/slave/flags.hpp
----------------------------------------------------------------------
diff --git a/src/slave/flags.hpp b/src/slave/flags.hpp
index f76f0f6..3e93b52 100644
--- a/src/slave/flags.hpp
+++ b/src/slave/flags.hpp
@@ -74,10 +74,6 @@ public:
double gc_disk_headroom;
Duration disk_watch_interval;
- // TODO(nnielsen): Deprecate resource_monitoring_interval flag after
- // Mesos 0.23.0.
- Duration resource_monitoring_interval;
-
std::string recover;
Duration recovery_timeout;
bool strict;