Skip to content

Commit 5cd4dfb

Browse files
authored
Relax cluster metadata version check (#37834)
If the in_sync_allocations of index-1 or index-2 is changed, the metadata version will be increased. This leads to the failure in the metadata version checks. We need to relax them. Closes #37820
1 parent 455f223 commit 5cd4dfb

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

server/src/test/java/org/elasticsearch/cluster/SimpleClusterStateIT.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,20 +119,19 @@ public void testMetadata() throws Exception {
119119
assertThat(clusterStateResponse.getState().metaData().indices().size(), is(0));
120120
}
121121

122-
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/37820")
123122
public void testMetadataVersion() {
124123
createIndex("index-1");
125124
createIndex("index-2");
126-
long metadataVersion = client().admin().cluster().prepareState().get().getState().metaData().version();
127-
assertThat(metadataVersion, greaterThan(0L));
125+
long baselineVersion = client().admin().cluster().prepareState().get().getState().metaData().version();
126+
assertThat(baselineVersion, greaterThan(0L));
128127
assertThat(client().admin().cluster().prepareState().setIndices("index-1").get().getState().metaData().version(),
129-
equalTo(metadataVersion));
128+
greaterThanOrEqualTo(baselineVersion));
130129
assertThat(client().admin().cluster().prepareState().setIndices("index-2").get().getState().metaData().version(),
131-
equalTo(metadataVersion));
130+
greaterThanOrEqualTo(baselineVersion));
132131
assertThat(client().admin().cluster().prepareState().setIndices("*").get().getState().metaData().version(),
133-
equalTo(metadataVersion));
132+
greaterThanOrEqualTo(baselineVersion));
134133
assertThat(client().admin().cluster().prepareState().setIndices("not-found").get().getState().metaData().version(),
135-
equalTo(metadataVersion));
134+
greaterThanOrEqualTo(baselineVersion));
136135
assertThat(client().admin().cluster().prepareState().clear().setMetaData(false).get().getState().metaData().version(),
137136
equalTo(0L));
138137
}

0 commit comments

Comments
 (0)