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 2013/12/13 01:40:57 UTC
[5/5] git commit: Renamed getRoleSummary to getJobSummary.
Renamed getRoleSummary to getJobSummary.
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/8badb0f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/8badb0f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/8badb0f2
Branch: refs/heads/skarumuri/MESOS-4679_api_jobs_by_role
Commit: 8badb0f2d950f638faa4c737e2ed24e9f25e0b24
Parents: 80dd60d
Author: Suman Karumuri <sk...@twitter.com>
Authored: Wed Dec 4 17:31:29 2013 -0800
Committer: Suman Karumuri <sk...@twitter.com>
Committed: Wed Dec 4 17:50:27 2013 -0800
----------------------------------------------------------------------
.../thrift/SchedulerThriftInterface.java | 45 ++++++++++----------
.../thrift/com/twitter/aurora/gen/api.thrift | 10 ++---
.../thrift/SchedulerThriftInterfaceTest.java | 14 +++---
.../scheduler/thrift/aop/ForwardingThrift.java | 4 +-
4 files changed, 36 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/8badb0f2/src/main/java/com/twitter/aurora/scheduler/thrift/SchedulerThriftInterface.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/twitter/aurora/scheduler/thrift/SchedulerThriftInterface.java b/src/main/java/com/twitter/aurora/scheduler/thrift/SchedulerThriftInterface.java
index d6af11f..705a926 100644
--- a/src/main/java/com/twitter/aurora/scheduler/thrift/SchedulerThriftInterface.java
+++ b/src/main/java/com/twitter/aurora/scheduler/thrift/SchedulerThriftInterface.java
@@ -66,6 +66,8 @@ import com.twitter.aurora.gen.JobConfigRewrite;
import com.twitter.aurora.gen.JobConfigValidation;
import com.twitter.aurora.gen.JobConfiguration;
import com.twitter.aurora.gen.JobKey;
+import com.twitter.aurora.gen.JobSummary;
+import com.twitter.aurora.gen.JobSummaryResult;
import com.twitter.aurora.gen.ListBackupsResult;
import com.twitter.aurora.gen.Lock;
import com.twitter.aurora.gen.LockKey;
@@ -78,8 +80,6 @@ import com.twitter.aurora.gen.Response;
import com.twitter.aurora.gen.ResponseCode;
import com.twitter.aurora.gen.Result;
import com.twitter.aurora.gen.RewriteConfigsRequest;
-import com.twitter.aurora.gen.RoleSummary;
-import com.twitter.aurora.gen.RoleSummaryResult;
import com.twitter.aurora.gen.ScheduleStatus;
import com.twitter.aurora.gen.ScheduleStatusResult;
import com.twitter.aurora.gen.SessionKey;
@@ -376,45 +376,44 @@ class SchedulerThriftInterface implements AuroraAdmin.Iface {
}
@Override
- public Response getRoleSummary() {
- final Function<String, RoleSummary> CREATE_ROLE_SUMMARY = new Function<String, RoleSummary>() {
- @Override public RoleSummary apply(String ownerRole) {
- RoleSummary role = new RoleSummary();
- role.setRole(ownerRole);
- role.setCronJobCount(0);
- role.setJobCount(0);
- return role;
+ public Response getJobSummary() {
+ final Function<String, JobSummary> CREATE_JOB_SUMMARY = new Function<String, JobSummary>() {
+ @Override public JobSummary apply(String ownerRole) {
+ JobSummary summary = new JobSummary();
+ summary.setRole(ownerRole);
+ summary.setCronJobCount(0);
+ summary.setJobCount(0);
+ return summary;
}
};
- final Ordering<RoleSummary> ROLE_ORDERING = Ordering.natural().onResultOf(
- new Function<RoleSummary, String>() {
- @Override public String apply(RoleSummary role) {
- return role.getRole();
+ final Ordering<JobSummary> JOB_ORDERING = Ordering.natural().onResultOf(
+ new Function<JobSummary, String>() {
+ @Override public String apply(JobSummary jobSummary) {
+ return jobSummary.getRole();
}
});
// TODO(Suman Karumuri): Respond to this request without an expensive query.
- LoadingCache<String, RoleSummary> roleSummaries =
- CacheBuilder.newBuilder().build(CacheLoader.from(CREATE_ROLE_SUMMARY));
+ LoadingCache<String, JobSummary> jobSummaries =
+ CacheBuilder.newBuilder().build(CacheLoader.from(CREATE_JOB_SUMMARY));
Set<IScheduledTask> tasks =
Storage.Util.weaklyConsistentFetchTasks(storage, Query.unscoped());
for (ITaskConfig task : Iterables.transform(tasks, Tasks.SCHEDULED_TO_INFO)) {
- RoleSummary roleSummary = roleSummaries.getUnchecked(task.getOwner().getRole());
- roleSummary.setJobCount(roleSummary.getJobCount() + 1);
+ JobSummary jobSummary = jobSummaries.getUnchecked(task.getOwner().getRole());
+ jobSummary.setJobCount(jobSummary.getJobCount() + 1);
}
- // Add cron job counts for each role.
for (IJobConfiguration job : cronJobManager.getJobs()) {
- RoleSummary roleSummary = roleSummaries.getUnchecked(job.getOwner().getRole());
- roleSummary.setCronJobCount(roleSummary.getCronJobCount() + 1);
+ JobSummary jobSummary = jobSummaries.getUnchecked(job.getOwner().getRole());
+ jobSummary.setCronJobCount(jobSummary.getCronJobCount() + 1);
}
return new Response()
.setResponseCode(OK)
- .setResult(Result.roleSummaryResult(
- new RoleSummaryResult(ROLE_ORDERING.sortedCopy(roleSummaries.asMap().values()))));
+ .setResult(Result.jobSummaryResult(
+ new JobSummaryResult(JOB_ORDERING.sortedCopy(jobSummaries.asMap().values()))));
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/8badb0f2/src/main/thrift/com/twitter/aurora/gen/api.thrift
----------------------------------------------------------------------
diff --git a/src/main/thrift/com/twitter/aurora/gen/api.thrift b/src/main/thrift/com/twitter/aurora/gen/api.thrift
index 5d6532c..836e38b 100644
--- a/src/main/thrift/com/twitter/aurora/gen/api.thrift
+++ b/src/main/thrift/com/twitter/aurora/gen/api.thrift
@@ -356,7 +356,7 @@ struct HostStatus {
2: MaintenanceMode mode
}
-struct RoleSummary {
+struct JobSummary {
1: string role
2: i32 jobCount
3: i32 cronJobCount
@@ -390,8 +390,8 @@ struct EndMaintenanceResult {
1: set<HostStatus> statuses
}
-struct RoleSummaryResult {
- 1: list<RoleSummary> summaries
+struct JobSummaryResult {
+ 1: list<JobSummary> summaries
}
// Specifies validation level for the populateJobConfig.
@@ -413,7 +413,7 @@ union Result {
11: EndMaintenanceResult endMaintenanceResult
15: APIVersion getVersionResult
16: AcquireLockResult acquireLockResult
- 17: RoleSummaryResult roleSummaryResult
+ 17: JobSummaryResult jobSummaryResult
}
struct Response {
@@ -426,7 +426,7 @@ struct Response {
// A service that provides all the read only calls to the Aurora scheduler.
service ReadOnlyScheduler {
// Returns a summary of the jobs grouped by role.
- Response getRoleSummary()
+ Response getJobSummary()
}
// Due to assumptions in the client all authenticated RPCs must have a SessionKey as their
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/8badb0f2/src/test/java/com/twitter/aurora/scheduler/thrift/SchedulerThriftInterfaceTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/twitter/aurora/scheduler/thrift/SchedulerThriftInterfaceTest.java b/src/test/java/com/twitter/aurora/scheduler/thrift/SchedulerThriftInterfaceTest.java
index 30a3969..826f1a9 100644
--- a/src/test/java/com/twitter/aurora/scheduler/thrift/SchedulerThriftInterfaceTest.java
+++ b/src/test/java/com/twitter/aurora/scheduler/thrift/SchedulerThriftInterfaceTest.java
@@ -50,6 +50,8 @@ import com.twitter.aurora.gen.JobConfigRewrite;
import com.twitter.aurora.gen.JobConfigValidation;
import com.twitter.aurora.gen.JobConfiguration;
import com.twitter.aurora.gen.JobKey;
+import com.twitter.aurora.gen.JobSummary;
+import com.twitter.aurora.gen.JobSummaryResult;
import com.twitter.aurora.gen.LimitConstraint;
import com.twitter.aurora.gen.Lock;
import com.twitter.aurora.gen.LockKey;
@@ -57,8 +59,6 @@ import com.twitter.aurora.gen.Quota;
import com.twitter.aurora.gen.Response;
import com.twitter.aurora.gen.ResponseCode;
import com.twitter.aurora.gen.RewriteConfigsRequest;
-import com.twitter.aurora.gen.RoleSummary;
-import com.twitter.aurora.gen.RoleSummaryResult;
import com.twitter.aurora.gen.ScheduleStatus;
import com.twitter.aurora.gen.ScheduledTask;
import com.twitter.aurora.gen.SessionKey;
@@ -1082,17 +1082,17 @@ public class SchedulerThriftInterfaceTest extends EasyMockTest {
storageUtil.expectTaskFetch(Query.unscoped(), immediateTask, immediateTaskTwo);
expect(cronJobManager.getJobs()).andReturn(IJobConfiguration.setFromBuilders(crons));
- RoleSummaryResult expectedResult = new RoleSummaryResult();
+ JobSummaryResult expectedResult = new JobSummaryResult();
expectedResult.addToSummaries(
- new RoleSummary().setRole(ROLE).setCronJobCount(2).setJobCount(1));
+ new JobSummary().setRole(ROLE).setCronJobCount(2).setJobCount(1));
expectedResult.addToSummaries(
- new RoleSummary().setRole(BAZ_ROLE).setCronJobCount(1).setJobCount(1));
+ new JobSummary().setRole(BAZ_ROLE).setCronJobCount(1).setJobCount(1));
control.replay();
- Response response = thrift.getRoleSummary();
+ Response response = thrift.getJobSummary();
assertEquals(ResponseCode.OK, response.getResponseCode());
- assertEquals(expectedResult, response.getResult().getRoleSummaryResult());
+ assertEquals(expectedResult, response.getResult().getJobSummaryResult());
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/8badb0f2/src/test/java/com/twitter/aurora/scheduler/thrift/aop/ForwardingThrift.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/twitter/aurora/scheduler/thrift/aop/ForwardingThrift.java b/src/test/java/com/twitter/aurora/scheduler/thrift/aop/ForwardingThrift.java
index b76c92b..37c0da2 100644
--- a/src/test/java/com/twitter/aurora/scheduler/thrift/aop/ForwardingThrift.java
+++ b/src/test/java/com/twitter/aurora/scheduler/thrift/aop/ForwardingThrift.java
@@ -107,8 +107,8 @@ abstract class ForwardingThrift implements AuroraAdmin.Iface {
}
@Override
- public Response getRoleSummary() throws TException {
- return delegate.getRoleSummary();
+ public Response getJobSummary() throws TException {
+ return delegate.getJobSummary();
}
@Override