From ca931f4b39e17575a06bd961fc155be6516e19de Mon Sep 17 00:00:00 2001
From: Dimitris Athanasiou <dimitris@elastic.co>
Date: Fri, 17 Mar 2017 17:56:46 +0000
Subject: [PATCH] [ML] Default model_snapshots_retention_days to 1
 (elastic/x-pack-elasticsearch#759)

relates elastic/x-pack-elasticsearch#722

Original commit: elastic/x-pack-elasticsearch@e68aaf229cbe4420f039fa274cd76db5ead5abae
---
 .../java/org/elasticsearch/xpack/ml/job/config/Job.java     | 2 +-
 .../xpack/ml/integration/DeleteExpiredDataIT.java           | 6 +++---
 .../org/elasticsearch/xpack/ml/job/config/JobTests.java     | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/Job.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/Job.java
index cdfae1abafa..a815bb91d9e 100644
--- a/plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/Job.java
+++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/Job.java
@@ -510,7 +510,7 @@ public class Job extends AbstractDiffable<Job> implements Writeable, ToXContent
         private ModelDebugConfig modelDebugConfig;
         private Long renormalizationWindowDays;
         private TimeValue backgroundPersistInterval;
-        private Long modelSnapshotRetentionDays;
+        private Long modelSnapshotRetentionDays = 1L;
         private Long resultsRetentionDays;
         private Map<String, Object> customSettings;
         private String modelSnapshotId;
diff --git a/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/DeleteExpiredDataIT.java b/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/DeleteExpiredDataIT.java
index 26c8c2e6b79..94ac8c421ac 100644
--- a/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/DeleteExpiredDataIT.java
+++ b/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/DeleteExpiredDataIT.java
@@ -119,9 +119,9 @@ public class DeleteExpiredDataIT extends SecurityIntegTestCase {
     }
 
     public void testDeleteExpiredData() throws Exception {
-        jobs.add(newJobBuilder("no-retention").build());
-        jobs.add(newJobBuilder("results-retention").setResultsRetentionDays(1L).build());
-        jobs.add(newJobBuilder("snapshots-retention").setModelSnapshotRetentionDays(2L).build());
+        jobs.add(newJobBuilder("no-retention").setResultsRetentionDays(null).setModelSnapshotRetentionDays(null).build());
+        jobs.add(newJobBuilder("results-retention").setResultsRetentionDays(1L).setModelSnapshotRetentionDays(null).build());
+        jobs.add(newJobBuilder("snapshots-retention").setResultsRetentionDays(null).setModelSnapshotRetentionDays(2L).build());
         jobs.add(newJobBuilder("results-and-snapshots-retention").setResultsRetentionDays(1L).setModelSnapshotRetentionDays(2L).build());
 
         long now = System.currentTimeMillis();
diff --git a/plugin/src/test/java/org/elasticsearch/xpack/ml/job/config/JobTests.java b/plugin/src/test/java/org/elasticsearch/xpack/ml/job/config/JobTests.java
index c51361cb60d..1c915cdb8fe 100644
--- a/plugin/src/test/java/org/elasticsearch/xpack/ml/job/config/JobTests.java
+++ b/plugin/src/test/java/org/elasticsearch/xpack/ml/job/config/JobTests.java
@@ -21,6 +21,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static org.hamcrest.Matchers.equalTo;
+
 public class JobTests extends AbstractSerializingTestCase<Job> {
 
     @Override
@@ -53,7 +55,7 @@ public class JobTests extends AbstractSerializingTestCase<Job> {
         assertNull(job.getModelDebugConfig());
         assertNull(job.getRenormalizationWindowDays());
         assertNull(job.getBackgroundPersistInterval());
-        assertNull(job.getModelSnapshotRetentionDays());
+        assertThat(job.getModelSnapshotRetentionDays(), equalTo(1L));
         assertNull(job.getResultsRetentionDays());
         assertNotNull(job.allFields());
         assertFalse(job.allFields().isEmpty());