@@ -272,46 +272,45 @@ public void testRolloverOnExistingIndex() throws Exception {
272
272
}
273
273
}
274
274
275
- @ AwaitsFix (bugUrl = "https://github.com/elastic/elasticsearch/issues/37037" )
276
275
public void testRolloverWithDateMath () {
277
276
ZonedDateTime now = ZonedDateTime .now (ZoneOffset .UTC );
278
277
assumeTrue ("only works on the same day" , now .plusMinutes (5 ).getDayOfYear () == now .getDayOfYear ());
279
- String index = "test-" + DateFormatter .forPattern ("YYYY .MM.dd" ).format (now ) + "-1" ;
278
+ String index = "test-" + DateFormatter .forPattern ("yyyy .MM.dd" ).format (now ) + "-1" ;
280
279
String dateMathExp = "<test-{now/d}-1>" ;
281
280
assertAcked (prepareCreate (dateMathExp ).addAlias (new Alias ("test_alias" )).get ());
282
281
ensureGreen (index );
283
282
// now we modify the provided name such that we can test that the pattern is carried on
284
283
client ().admin ().indices ().prepareClose (index ).get ();
285
284
client ().admin ().indices ().prepareUpdateSettings (index ).setSettings (Settings .builder ()
286
285
.put (IndexMetaData .SETTING_INDEX_PROVIDED_NAME ,
287
- "<test-{now/M{YYYY .MM}}-1>" )).get ();
286
+ "<test-{now/M{yyyy .MM}}-1>" )).get ();
288
287
289
288
client ().admin ().indices ().prepareOpen (index ).get ();
290
289
ensureGreen (index );
291
290
RolloverResponse response = client ().admin ().indices ().prepareRolloverIndex ("test_alias" ).get ();
292
291
assertThat (response .getOldIndex (), equalTo (index ));
293
- assertThat (response .getNewIndex (), equalTo ("test-" + DateFormatter .forPattern ("YYYY .MM" ).format (now ) + "-000002" ));
292
+ assertThat (response .getNewIndex (), equalTo ("test-" + DateFormatter .forPattern ("yyyy .MM" ).format (now ) + "-000002" ));
294
293
assertThat (response .isDryRun (), equalTo (false ));
295
294
assertThat (response .isRolledOver (), equalTo (true ));
296
295
assertThat (response .getConditionStatus ().size (), equalTo (0 ));
297
296
298
297
response = client ().admin ().indices ().prepareRolloverIndex ("test_alias" ).get ();
299
- assertThat (response .getOldIndex (), equalTo ("test-" + DateFormatter .forPattern ("YYYY .MM" ).format (now ) + "-000002" ));
300
- assertThat (response .getNewIndex (), equalTo ("test-" + DateFormatter .forPattern ("YYYY .MM" ).format (now ) + "-000003" ));
298
+ assertThat (response .getOldIndex (), equalTo ("test-" + DateFormatter .forPattern ("yyyy .MM" ).format (now ) + "-000002" ));
299
+ assertThat (response .getNewIndex (), equalTo ("test-" + DateFormatter .forPattern ("yyyy .MM" ).format (now ) + "-000003" ));
301
300
assertThat (response .isDryRun (), equalTo (false ));
302
301
assertThat (response .isRolledOver (), equalTo (true ));
303
302
assertThat (response .getConditionStatus ().size (), equalTo (0 ));
304
303
305
304
GetSettingsResponse getSettingsResponse = client ().admin ().indices ().prepareGetSettings (response .getOldIndex (),
306
305
response .getNewIndex ()).get ();
307
- assertEquals ("<test-{now/M{YYYY .MM}}-000002>" , getSettingsResponse .getSetting (response .getOldIndex (),
306
+ assertEquals ("<test-{now/M{yyyy .MM}}-000002>" , getSettingsResponse .getSetting (response .getOldIndex (),
308
307
IndexMetaData .SETTING_INDEX_PROVIDED_NAME ));
309
- assertEquals ("<test-{now/M{YYYY .MM}}-000003>" , getSettingsResponse .getSetting (response .getNewIndex (),
308
+ assertEquals ("<test-{now/M{yyyy .MM}}-000003>" , getSettingsResponse .getSetting (response .getNewIndex (),
310
309
IndexMetaData .SETTING_INDEX_PROVIDED_NAME ));
311
310
312
311
response = client ().admin ().indices ().prepareRolloverIndex ("test_alias" ).setNewIndexName ("<test-{now/d}-000004>" ).get ();
313
- assertThat (response .getOldIndex (), equalTo ("test-" + DateFormatter .forPattern ("YYYY .MM" ).format (now ) + "-000003" ));
314
- assertThat (response .getNewIndex (), equalTo ("test-" + DateFormatter .forPattern ("YYYY .MM.dd" ).format (now ) + "-000004" ));
312
+ assertThat (response .getOldIndex (), equalTo ("test-" + DateFormatter .forPattern ("yyyy .MM" ).format (now ) + "-000003" ));
313
+ assertThat (response .getNewIndex (), equalTo ("test-" + DateFormatter .forPattern ("yyyy .MM.dd" ).format (now ) + "-000004" ));
315
314
assertThat (response .isDryRun (), equalTo (false ));
316
315
assertThat (response .isRolledOver (), equalTo (true ));
317
316
assertThat (response .getConditionStatus ().size (), equalTo (0 ));
0 commit comments