Repository: aurora Updated Branches: refs/heads/master bcb477429 -> 1b1c70c79
Remove ChainedPathDetector and root argument from the observer. Testing Done: e2e tests passed Bugs closed: AURORA-1338 Reviewed at https://reviews.apache.org/r/39629/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/1b1c70c7 Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/1b1c70c7 Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/1b1c70c7 Branch: refs/heads/master Commit: 1b1c70c79a0b4a96263508c5918d6d9d0646f8ec Parents: bcb4774 Author: Zameer Manji <[email protected]> Authored: Thu Oct 29 16:25:53 2015 -0700 Committer: Zameer Manji <[email protected]> Committed: Thu Oct 29 16:25:53 2015 -0700 ---------------------------------------------------------------------- NEWS | 1 + .../vagrant/upstart/aurora-thermos-observer.conf | 1 - .../python/apache/aurora/tools/thermos_observer.py | 15 +-------------- 3 files changed, 2 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/1b1c70c7/NEWS ---------------------------------------------------------------------- diff --git a/NEWS b/NEWS index 40fe139..6e158d0 100644 --- a/NEWS +++ b/NEWS @@ -17,6 +17,7 @@ - Thrift ConfigGroup.instanceIds field has been deprecated. Use ConfigGroup.instances instead. - Deprecated SessionValidator and CapabilityValidator interfaces have been removed. All SessionKey-typed arguments are now nullable and ignored by the scheduler Thrift API. +- Removed the `--root` option from the observer. 0.9.0 ----- http://git-wip-us.apache.org/repos/asf/aurora/blob/1b1c70c7/examples/vagrant/upstart/aurora-thermos-observer.conf ---------------------------------------------------------------------- diff --git a/examples/vagrant/upstart/aurora-thermos-observer.conf b/examples/vagrant/upstart/aurora-thermos-observer.conf index d7d649d..9cda0ec 100644 --- a/examples/vagrant/upstart/aurora-thermos-observer.conf +++ b/examples/vagrant/upstart/aurora-thermos-observer.conf @@ -16,7 +16,6 @@ respawn post-stop exec sleep 5 exec /home/vagrant/aurora/dist/thermos_observer.pex \ - --root=/var/run/thermos \ --port=1338 \ --log_to_disk=NONE \ --log_to_stderr=google:INFO http://git-wip-us.apache.org/repos/asf/aurora/blob/1b1c70c7/src/main/python/apache/aurora/tools/thermos_observer.py ---------------------------------------------------------------------- diff --git a/src/main/python/apache/aurora/tools/thermos_observer.py b/src/main/python/apache/aurora/tools/thermos_observer.py index 82de0a1..1a4fb55 100644 --- a/src/main/python/apache/aurora/tools/thermos_observer.py +++ b/src/main/python/apache/aurora/tools/thermos_observer.py @@ -22,20 +22,10 @@ from twitter.common.log.options import LogOptions from twitter.common.quantity import Amount, Time from apache.aurora.executor.common.path_detector import MesosPathDetector -from apache.thermos.common.constants import DEFAULT_CHECKPOINT_ROOT -from apache.thermos.monitoring.detector import ChainedPathDetector, FixedPathDetector from apache.thermos.observer.http.configure import configure_server from apache.thermos.observer.task_observer import TaskObserver app.add_option( - '--root', - dest='root', - type='string', - default=DEFAULT_CHECKPOINT_ROOT, - help='The thermos checkpoint root directory to search for Thermos tasks [default: %default]') - - -app.add_option( '--mesos-root', dest='mesos_root', type='string', @@ -66,10 +56,7 @@ def sleep_forever(): def initialize(options): - path_detector = ChainedPathDetector( - FixedPathDetector(options.root), - MesosPathDetector(options.mesos_root), - ) + path_detector = MesosPathDetector(options.mesos_root) polling_interval = Amount(options.polling_interval_secs, Time.SECONDS) return TaskObserver(path_detector, interval=polling_interval)
