Add test to check existence max_unsafe_timestamp in commit

In the previous commit, we ensured that an opening index commit must
have all 6.x commit tags before opening engine. This commit adds a test
to catch a silly mistake introduced previously.

Author: dnhatn

server/src/main/java/org/elasticsearch/index/store/Store.java

@@ -1539,7 +1539,7 @@ public boolean ensureIndexHas6xCommitTags() throws IOException {
                 maps.put(SequenceNumbers.LOCAL_CHECKPOINT_KEY, Long.toString(SequenceNumbers.NO_OPS_PERFORMED));
             }
             if (userData.containsKey(InternalEngine.MAX_UNSAFE_AUTO_ID_TIMESTAMP_COMMIT_ID) == false) {
-                userData.put(InternalEngine.MAX_UNSAFE_AUTO_ID_TIMESTAMP_COMMIT_ID, "-1");
+                maps.put(InternalEngine.MAX_UNSAFE_AUTO_ID_TIMESTAMP_COMMIT_ID, "-1");
             }
             if (maps.isEmpty() == false) {
                 updateCommitData(writer, maps);

server/src/test/java/org/elasticsearch/index/store/StoreTests.java

@@ -63,6 +63,7 @@
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.index.engine.Engine;
+import org.elasticsearch.index.engine.InternalEngine;
 import org.elasticsearch.index.seqno.SequenceNumbers;
 import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.index.translog.Translog;
@@ -1076,7 +1077,7 @@ public Directory newDirectory() throws IOException {
         store.close();
     }
 
-    public void testEnsureIndexHasHistoryUUIDAndSeqNo() throws IOException {
+    public void testEnsureIndexHas6xCommitTags() throws IOException {
         final ShardId shardId = new ShardId("index", "_na_", 1);
         DirectoryService directoryService = new LuceneManagedDirectoryService(random());
         try (Store store = new Store(shardId, INDEX_SETTINGS, directoryService, new DummyShardLock(shardId))) {
@@ -1088,51 +1089,57 @@ public void testEnsureIndexHasHistoryUUIDAndSeqNo() throws IOException {
                 newCommitData.remove(Engine.HISTORY_UUID_KEY);
                 newCommitData.remove(SequenceNumbers.LOCAL_CHECKPOINT_KEY);
                 newCommitData.remove(SequenceNumbers.MAX_SEQ_NO);
+                newCommitData.remove(InternalEngine.MAX_UNSAFE_AUTO_ID_TIMESTAMP_COMMIT_ID);
                 writer.setLiveCommitData(newCommitData.entrySet());
                 writer.commit();
             }
-
-            store.ensureIndexHas6xCommitTags();
+            assertThat(store.ensureIndexHas6xCommitTags(), equalTo(true));
             SegmentInfos segmentInfos = Lucene.readSegmentInfos(store.directory());
             assertThat(segmentInfos.getUserData(), hasKey(Engine.HISTORY_UUID_KEY));
+            assertThat(segmentInfos.getUserData(), hasEntry(equalTo(InternalEngine.MAX_UNSAFE_AUTO_ID_TIMESTAMP_COMMIT_ID), equalTo("-1")));
             assertThat(segmentInfos.getUserData(), hasEntry(equalTo(SequenceNumbers.LOCAL_CHECKPOINT_KEY), equalTo("-1")));
             assertThat(segmentInfos.getUserData(), hasEntry(equalTo(SequenceNumbers.MAX_SEQ_NO), equalTo("-1")));
-
-            // Keep existing seqno.
+            // Keeps everything
             final long maxSeqno = randomNonNegativeLong();
             final long localCheckpoint = randomLongBetween(0, maxSeqno);
+            final long unsafeTimestamp = randomNonNegativeLong();
             final String historyUUID = segmentInfos.userData.get(Engine.HISTORY_UUID_KEY);
             try (IndexWriter writer = openWriter(store)) {
                 Map<String, String> newCommitData = new HashMap<>();
                 writer.getLiveCommitData().forEach(e -> newCommitData.put(e.getKey(), e.getValue()));
                 newCommitData.put(SequenceNumbers.LOCAL_CHECKPOINT_KEY, Long.toString(localCheckpoint));
                 newCommitData.put(SequenceNumbers.MAX_SEQ_NO, Long.toString(maxSeqno));
+                newCommitData.put(InternalEngine.MAX_UNSAFE_AUTO_ID_TIMESTAMP_COMMIT_ID, Long.toString(unsafeTimestamp));
                 writer.setLiveCommitData(newCommitData.entrySet());
                 writer.commit();
             }
-            store.ensureIndexHas6xCommitTags();
+            assertThat(store.ensureIndexHas6xCommitTags(), equalTo(false));
             segmentInfos = Lucene.readSegmentInfos(store.directory());
             assertThat(segmentInfos.getUserData(),
                 hasEntry(equalTo(Engine.HISTORY_UUID_KEY), equalTo(historyUUID)));
             assertThat(segmentInfos.getUserData(),
                 hasEntry(equalTo(SequenceNumbers.LOCAL_CHECKPOINT_KEY), equalTo(Long.toString(localCheckpoint))));
             assertThat(segmentInfos.getUserData(),
                 hasEntry(equalTo(SequenceNumbers.MAX_SEQ_NO), equalTo(Long.toString(maxSeqno))));
-
+            assertThat(segmentInfos.getUserData(),
+                hasEntry(equalTo(InternalEngine.MAX_UNSAFE_AUTO_ID_TIMESTAMP_COMMIT_ID), equalTo(Long.toString(unsafeTimestamp))));
+            // Generate a new historyUUID but keeps the rest
             try (IndexWriter writer = openWriter(store)) {
                 Map<String, String> newCommitData = new HashMap<>();
                 writer.getLiveCommitData().forEach(e -> newCommitData.put(e.getKey(), e.getValue()));
                 newCommitData.remove(Engine.HISTORY_UUID_KEY);
                 writer.setLiveCommitData(newCommitData.entrySet());
                 writer.commit();
             }
-            store.ensureIndexHas6xCommitTags();
+            assertThat(store.ensureIndexHas6xCommitTags(), equalTo(true));
             segmentInfos = Lucene.readSegmentInfos(store.directory());
             assertThat(segmentInfos.getUserData(), hasKey(Engine.HISTORY_UUID_KEY));
             assertThat(segmentInfos.getUserData(),
                 hasEntry(equalTo(SequenceNumbers.LOCAL_CHECKPOINT_KEY), equalTo(Long.toString(localCheckpoint))));
             assertThat(segmentInfos.getUserData(),
                 hasEntry(equalTo(SequenceNumbers.MAX_SEQ_NO), equalTo(Long.toString(maxSeqno))));
+            assertThat(segmentInfos.getUserData(),
+                hasEntry(equalTo(InternalEngine.MAX_UNSAFE_AUTO_ID_TIMESTAMP_COMMIT_ID), equalTo(Long.toString(unsafeTimestamp))));
         }
     }