Fix handling of null job

elastic · Dec 14, 2018 · 529d472 · 529d472
1 parent 666f99b
commit 529d472
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlConfigMigrator.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlConfigMigrator.java
@@ -73,7 +73,7 @@
  * on that rather than the clusterstate.
  *
  * The number of configs indexed in each bulk operation is limited by {@link #MAX_BULK_WRITE_SIZE}
- * pairs of datafeeds adn jobs are migrated together.
+ * pairs of datafeeds and jobs are migrated together.
  */
 public class MlConfigMigrator {
 
@@ -376,7 +376,7 @@ public int totalCount() {
 
     /**
      * Return at most {@link #MAX_BULK_WRITE_SIZE} configs favouring
-     * datafeed and job pairs so if a datafeed is choosen so is its job.
+     * datafeed and job pairs so if a datafeed is chosen so is its job.
      *
      * @param datafeedsToMigrate Datafeed configs
      * @param jobsToMigrate      Job configs
@@ -396,11 +396,11 @@ public static JobsAndDatafeeds limitWrites(Collection<DatafeedConfig> datafeedsT
         // prioritise datafeed and job pairs
         for (DatafeedConfig datafeedConfig : datafeedsToMigrate) {
             if (count < MAX_BULK_WRITE_SIZE) {
-                Job datafeedsJob = jobsToMigrate.remove(datafeedConfig.getJobId());
-                jobsAndDatafeeds.jobs.add(datafeedsJob);
+                jobsAndDatafeeds.datafeedConfigs.add(datafeedConfig);
                 count++;
+                Job datafeedsJob = jobsToMigrate.remove(datafeedConfig.getJobId());
                 if (datafeedsJob != null) {
-                    jobsAndDatafeeds.datafeedConfigs.add(datafeedConfig);
+                    jobsAndDatafeeds.jobs.add(datafeedsJob);
                     count++;
                 }
             }

diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/MlConfigMigratorTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/MlConfigMigratorTests.java
@@ -405,6 +405,14 @@ public void testLimitWrites_GivenMoreJobsThanDatafeeds() {
         assertTrue(selectedJobIds.containsAll(datafeedJobIds));
     }
 
+    public void testLimitWrites_GivenNullJob() {
+        List<DatafeedConfig> datafeeds = Collections.singletonList(createCompatibleDatafeed("no-job-for-this-datafeed"));
+        MlConfigMigrator.JobsAndDatafeeds jobsAndDatafeeds = MlConfigMigrator.limitWrites(datafeeds, Collections.emptyMap());
+
+        assertThat(jobsAndDatafeeds.datafeedConfigs, hasSize(1));
+        assertThat(jobsAndDatafeeds.jobs, empty());
+    }
+
     private DatafeedConfig createCompatibleDatafeed(String jobId) {
         // create a datafeed without aggregations or anything
         // else that may cause validation errors