aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wfar...@apache.org
Subject git commit: Remove ability to install a custom quota module.
Date Thu, 12 Dec 2013 18:10:36 GMT
Updated Branches:
  refs/heads/master e54a3d18e -> 0eefbcbb5


Remove ability to install a custom quota module.

Testing Done:
gradle clean build

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


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

Branch: refs/heads/master
Commit: 0eefbcbb57286273ae2908175c5ce028dcdbee99
Parents: e54a3d1
Author: Bill Farner <wfarner@apache.org>
Authored: Thu Dec 12 10:10:12 2013 -0800
Committer: Bill Farner <terasurfer@gmail.com>
Committed: Thu Dec 12 10:10:12 2013 -0800

----------------------------------------------------------------------
 .../com/twitter/aurora/scheduler/app/AppModule.java |  2 ++
 .../twitter/aurora/scheduler/app/SchedulerMain.java | 16 +---------------
 2 files changed, 3 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/0eefbcbb/src/main/java/com/twitter/aurora/scheduler/app/AppModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/twitter/aurora/scheduler/app/AppModule.java b/src/main/java/com/twitter/aurora/scheduler/app/AppModule.java
index decb3e9..24702b0 100644
--- a/src/main/java/com/twitter/aurora/scheduler/app/AppModule.java
+++ b/src/main/java/com/twitter/aurora/scheduler/app/AppModule.java
@@ -40,6 +40,7 @@ import com.twitter.aurora.scheduler.filter.SchedulingFilterImpl;
 import com.twitter.aurora.scheduler.http.ClusterName;
 import com.twitter.aurora.scheduler.http.ServletModule;
 import com.twitter.aurora.scheduler.metadata.MetadataModule;
+import com.twitter.aurora.scheduler.quota.QuotaModule;
 import com.twitter.aurora.scheduler.state.StateModule;
 import com.twitter.aurora.scheduler.stats.AsyncStatsModule;
 import com.twitter.common.application.ShutdownRegistry;
@@ -99,6 +100,7 @@ class AppModule extends AbstractModule {
     install(new AsyncModule());
     install(new AsyncStatsModule());
     install(new MetadataModule());
+    install(new QuotaModule());
     install(new ServletModule());
     install(new SchedulerModule());
     install(new StateModule());

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/0eefbcbb/src/main/java/com/twitter/aurora/scheduler/app/SchedulerMain.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/twitter/aurora/scheduler/app/SchedulerMain.java b/src/main/java/com/twitter/aurora/scheduler/app/SchedulerMain.java
index 73b86a9..ec99e01 100644
--- a/src/main/java/com/twitter/aurora/scheduler/app/SchedulerMain.java
+++ b/src/main/java/com/twitter/aurora/scheduler/app/SchedulerMain.java
@@ -45,9 +45,6 @@ import com.twitter.aurora.scheduler.cron.CronScheduler;
 import com.twitter.aurora.scheduler.cron.noop.NoopCronModule;
 import com.twitter.aurora.scheduler.local.IsolatedSchedulerModule;
 import com.twitter.aurora.scheduler.log.mesos.MesosLogStreamModule;
-import com.twitter.aurora.scheduler.quota.QuotaManager;
-import com.twitter.aurora.scheduler.quota.QuotaModule;
-import com.twitter.aurora.scheduler.state.JobFilter;
 import com.twitter.aurora.scheduler.storage.backup.BackupModule;
 import com.twitter.aurora.scheduler.storage.log.LogStorage;
 import com.twitter.aurora.scheduler.storage.log.LogStorageModule;
@@ -126,16 +123,6 @@ public class SchedulerMain extends AbstractApplication {
       .add(CronScheduler.class)
       .build();
 
-  @CmdLine(name = "quota_module",
-      help = "A Guice module to provide quota subsystem bindings.")
-  private static final Arg<? extends Class<? extends Module>> QUOTA_MODULE =
-      Arg.create(QuotaModule.class);
-
-  private static final Iterable<Class<?>> QUOTA_MODULE_CLASSES = ImmutableList.<Class<?>>builder()
-      .add(QuotaManager.class)
-      .add(JobFilter.class)
-      .build();
-
   @Inject private SingletonService schedulerService;
   @Inject private LocalServiceRegistry serviceRegistry;
   @Inject private SchedulerLifecycle schedulerLifecycle;
@@ -190,8 +177,7 @@ public class SchedulerMain extends AbstractApplication {
   private static Iterable<? extends Module> getFlaggedModules() {
     return ImmutableList.of(
         getFlaggedModule(AUTH_MODULE, AUTH_MODULE_CLASSES),
-        getFlaggedModule(CRON_MODULE, CRON_MODULE_CLASSES),
-        getFlaggedModule(QUOTA_MODULE, QUOTA_MODULE_CLASSES));
+        getFlaggedModule(CRON_MODULE, CRON_MODULE_CLASSES));
   }
 
   static Iterable<? extends Module> getModules(


Mime
View raw message