You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by ma...@apache.org on 2014/01/23 22:25:46 UTC

git commit: Moved readonly thrift API calls into ReadOnlyScheduler.

Updated Branches:
  refs/heads/master 49e2262d3 -> 60b119a50


Moved readonly thrift API calls into ReadOnlyScheduler.

Moved readonly thrift calls into ReadOnlyScheduler.

Not updating the release version, since the change should have no impact on the consumers of AuroraSchedulerManager service.

Testing Done:
gradle clean build
gradle run to test with local UI.

Reviewed at https://reviews.apache.org/r/17205/


Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/60b119a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/60b119a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/60b119a5

Branch: refs/heads/master
Commit: 60b119a5066167b90337feb39dd5c803165f8de4
Parents: 49e2262
Author: Suman Karumuri <ma...@apache.org>
Authored: Thu Jan 23 11:46:15 2014 -0800
Committer: Suman Karumuri <sk...@twitter.com>
Committed: Thu Jan 23 11:46:15 2014 -0800

----------------------------------------------------------------------
 .../thrift/org/apache/aurora/gen/api.thrift     | 30 +++++++++-----------
 .../org/apache/aurora/gen/api.thrift.md5        |  2 +-
 2 files changed, 14 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/60b119a5/src/main/thrift/org/apache/aurora/gen/api.thrift
----------------------------------------------------------------------
diff --git a/src/main/thrift/org/apache/aurora/gen/api.thrift b/src/main/thrift/org/apache/aurora/gen/api.thrift
index 86220ff..7401037 100644
--- a/src/main/thrift/org/apache/aurora/gen/api.thrift
+++ b/src/main/thrift/org/apache/aurora/gen/api.thrift
@@ -428,6 +428,19 @@ struct Response {
 service ReadOnlyScheduler {
   // Returns a summary of the jobs grouped by role.
   Response getJobSummary()
+
+  // Fetches the status of tasks.
+  Response getTasksStatus(1: TaskQuery query)
+
+  // Fetches the status of jobs.
+  // ownerRole is optional, in which case all jobs are returned.
+  Response getJobs(1: string ownerRole)
+
+  // Fetches the quota allocated for a user.
+  Response getQuota(1: string ownerRole)
+
+  // Returns the current version of the API implementation
+  Response getVersion()
 }
 
 // Due to assumptions in the client all authenticated RPCs must have a SessionKey as their
@@ -449,26 +462,9 @@ service AuroraSchedulerManager extends ReadOnlyScheduler {
   // Restarts a batch of shards.
   Response restartShards(5: JobKey job, 3: set<i32> shardIds, 6: Lock lock 4: SessionKey session)
 
-  // TODO(Suman Karumuri): Move this call into read only api
-  // Fetches the status of tasks.
-  Response getTasksStatus(1: TaskQuery query)
-
-  // TODO(Suman Karumuri): Move this call into the read only api
-  // Fetches the status of jobs.
-  // ownerRole is optional, in which case all jobs are returned.
-  Response getJobs(1: string ownerRole)
-
   // Initiates a kill on tasks.
   Response killTasks(1: TaskQuery query, 3: Lock lock, 2: SessionKey session)
 
-  // TODO(Suman Karumuri): Move this call into the read only api
-  // Fetches the quota allocated for a user.
-  Response getQuota(1: string ownerRole)
-
-  // TODO(Suman Karumuri): Move this call into the read only api
-  // Returns the current version of the API implementation
-  Response getVersion()
-
   // Adds new instances specified by the AddInstancesConfig.
   // A job represented by the JobKey must be protected by Lock.
   Response addInstances(

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/60b119a5/src/test/resources/org/apache/aurora/gen/api.thrift.md5
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/aurora/gen/api.thrift.md5 b/src/test/resources/org/apache/aurora/gen/api.thrift.md5
index fd64486..42fdca2 100644
--- a/src/test/resources/org/apache/aurora/gen/api.thrift.md5
+++ b/src/test/resources/org/apache/aurora/gen/api.thrift.md5
@@ -1 +1 @@
-2ff234fad6ece5a9add3841c566c0fca
+867e9ac3b98e660b6fb830527098785c