You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by mc...@apache.org on 2014/07/24 15:28:34 UTC
git commit: Fix problem with deschedule command.
Repository: incubator-aurora
Updated Branches:
refs/heads/master 8930a5334 -> 3e58bbd77
Fix problem with deschedule command.
Bugs closed: aurora-597
Reviewed at https://reviews.apache.org/r/23872/
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/3e58bbd7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/3e58bbd7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/3e58bbd7
Branch: refs/heads/master
Commit: 3e58bbd77c3e19a75c0e321acbb9d2c27a35a2ce
Parents: 8930a53
Author: Mark Chu-Carroll <mc...@twopensource.com>
Authored: Thu Jul 24 09:20:47 2014 -0400
Committer: Mark Chu-Carroll <mc...@twitter.com>
Committed: Thu Jul 24 09:20:47 2014 -0400
----------------------------------------------------------------------
src/main/python/apache/aurora/client/api/__init__.py | 4 ++--
src/test/python/apache/aurora/client/cli/test_cron.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/3e58bbd7/src/main/python/apache/aurora/client/api/__init__.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/api/__init__.py b/src/main/python/apache/aurora/client/api/__init__.py
index 4e5cce0..371137e 100644
--- a/src/main/python/apache/aurora/client/api/__init__.py
+++ b/src/main/python/apache/aurora/client/api/__init__.py
@@ -65,9 +65,9 @@ class AuroraClientAPI(object):
log.debug('Lock %s' % lock)
return self._scheduler_proxy.scheduleCronJob(config.job(), lock)
- def deschedule_cron(self, jobkey):
+ def deschedule_cron(self, jobkey, lock=None):
log.info("Removing cron schedule for job %s" % jobkey)
- return self._scheduler_proxy.descheduleCronJob(jobkey.to_thrift())
+ return self._scheduler_proxy.descheduleCronJob(jobkey.to_thrift(), lock)
def populate_job_config(self, config):
return self._scheduler_proxy.populateJobConfig(config.job())
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/3e58bbd7/src/test/python/apache/aurora/client/cli/test_cron.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/test_cron.py b/src/test/python/apache/aurora/client/cli/test_cron.py
index d5f57df..f488432 100644
--- a/src/test/python/apache/aurora/client/cli/test_cron.py
+++ b/src/test/python/apache/aurora/client/cli/test_cron.py
@@ -113,7 +113,7 @@ class TestCronNoun(AuroraClientCommandTest):
assert result == EXIT_OK
assert mock_scheduler_proxy.descheduleCronJob.call_count == 1
mock_scheduler_proxy.descheduleCronJob.assert_called_with(JobKey(environment='test',
- role='bozo', name='hello'))
+ role='bozo', name='hello'), None)
def test_start_cron(self):
(mock_api, mock_scheduler_proxy) = self.create_mock_api()