Fix feature flag condition (#593)

* Fix feature flag condition * Fix tests
Netflix · Nov 28, 2023 · fe6604d · fe6604d
1 parent b577468
commit fe6604d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/...mantis-control-plane-server/src/main/java/io/mantisrx/master/jobcluster/job/JobActor.java b/...mantis-control-plane-server/src/main/java/io/mantisrx/master/jobcluster/job/JobActor.java
@@ -262,7 +262,7 @@ void initialize(boolean isSubmit) throws Exception {
         LOGGER.info("Stored mantis job");
 
         this.workerManager = new WorkerManager(this, jobClusterDefinition.getWorkerMigrationConfig(),
-                this.mantisScheduler, isSubmit);
+                this.mantisScheduler, isSubmit, ConfigurationProvider.getConfig().isBatchSchedulingEnabled());
 
         long checkAgainInSeconds = getWorkerTimeoutSecs();
         long refreshStageAssignementsDurationMs = ConfigurationProvider.getConfig()
@@ -1259,7 +1259,7 @@ class WorkerManager implements IWorkerManager {
                 .expireAfterWrite(1, TimeUnit.HOURS)
                 .build();
         private volatile boolean stageAssignmentPotentiallyChanged;
-        private final boolean batchSchedulingEnabled = ConfigurationProvider.getConfig().isBatchSchedulingEnabled();
+        private final boolean batchSchedulingEnabled;
 
         /**
          * Creates an instance of this class.
@@ -1272,12 +1272,13 @@ class WorkerManager implements IWorkerManager {
          */
         WorkerManager(
                 IMantisJobManager jobMgr, WorkerMigrationConfig migrationConfig, MantisScheduler scheduler,
-                boolean isSubmit) throws Exception {
+                boolean isSubmit, boolean batchSchedulingEnabled) throws Exception {
 
             workerNumberGenerator = new WorkerNumberGenerator((isSubmit) ? 0
                     : jobMgr.getJobDetails().getNextWorkerNumberToUse(), WorkerNumberGenerator.DEFAULT_INCREMENT_STEP);
             this.scheduler = scheduler;
             this.jobMgr = jobMgr;
+            this.batchSchedulingEnabled = batchSchedulingEnabled;
             migrationStrategy = MigrationStrategyFactory.getStrategy(jobId.getId(), migrationConfig);
             int noOfStages = mantisJobMetaData.getStageMetadata().size();
             if (noOfStages == 1) {
@@ -1497,9 +1498,9 @@ private void submitInitialWorkers() throws Exception {
                 if (!workers.isEmpty()) {
                     // queue to scheduler
                     if (batchSchedulingEnabled) {
-                        workers.forEach(this::queueTask);
-                    } else {
                         queueTasks(workers, empty());
+                    } else {
+                        workers.forEach(this::queueTask);
                     }
                 }
             } catch (Exception e) {

diff --git a/...trol-plane-server/src/main/java/io/mantisrx/server/master/config/MasterConfiguration.java b/...trol-plane-server/src/main/java/io/mantisrx/server/master/config/MasterConfiguration.java
@@ -387,7 +387,7 @@ default Duration getSchedulerIntervalBetweenRetries() {
     @Default("5000")
     int getResourceClusterActionsPermitsPerSecond();
 
-    @Config("mantis.batchScheduling.enabled")
+    @Config("mantis.scheduler.enable-batch")
     @Default("false")
     boolean isBatchSchedulingEnabled();
 

diff --git a/...s-control-plane-server/src/test/java/com/netflix/mantis/master/scheduler/TestHelpers.java b/...s-control-plane-server/src/test/java/com/netflix/mantis/master/scheduler/TestHelpers.java
@@ -147,6 +147,7 @@ public static void setupMasterConfig() {
         props.setProperty("mesos.lease.offer.expiry.secs", "1");
         props.setProperty("mantis.master.stage.assignment.refresh.interval.ms","-1");
         props.setProperty("mantis.master.api.cache.ttl.milliseconds","0");
+        props.setProperty("mantis.scheduler.enable-batch","true");
 
         ConfigurationProvider.initialize(new StaticPropertiesConfigurationFactory(props));
     }