Skip to content

Commit da91b1a

Browse files
Fix test issue in ForceMergeRequestTests (opensearch-project#12778) (opensearch-project#12890)
(cherry picked from commit 90b2e4d) Signed-off-by: Gao Binlong <gbinlong@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent 1157e67 commit da91b1a

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

server/src/test/java/org/opensearch/action/admin/indices/forcemerge/ForceMergeRequestTests.java

+15-8
Original file line numberDiff line numberDiff line change
@@ -97,23 +97,30 @@ public void testSerialization() throws Exception {
9797
public void testBwcSerialization() throws Exception {
9898
{
9999
final ForceMergeRequest sample = randomRequest();
100-
final Version compatibleVersion = VersionUtils.randomCompatibleVersion(random(), Version.CURRENT);
100+
final Version version = VersionUtils.randomCompatibleVersion(random(), Version.CURRENT);
101101
try (BytesStreamOutput out = new BytesStreamOutput()) {
102-
out.setVersion(compatibleVersion);
102+
out.setVersion(version);
103103
sample.writeTo(out);
104104

105105
try (StreamInput in = out.bytes().streamInput()) {
106-
in.setVersion(Version.CURRENT);
106+
in.setVersion(version);
107107
TaskId.readFromStream(in);
108108
in.readStringArray();
109109
IndicesOptions.readIndicesOptions(in);
110110
int maxNumSegments = in.readInt();
111111
boolean onlyExpungeDeletes = in.readBoolean();
112112
boolean flush = in.readBoolean();
113+
boolean primaryOnly = false;
114+
if (version.onOrAfter(Version.V_2_13_0)) {
115+
primaryOnly = in.readBoolean();
116+
}
113117
String forceMergeUUID = in.readOptionalString();
114118
assertEquals(sample.maxNumSegments(), maxNumSegments);
115119
assertEquals(sample.onlyExpungeDeletes(), onlyExpungeDeletes);
116120
assertEquals(sample.flush(), flush);
121+
if (version.onOrAfter(Version.V_2_13_0)) {
122+
assertEquals(sample.primaryOnly(), primaryOnly);
123+
}
117124
assertEquals(sample.forceMergeUUID(), forceMergeUUID);
118125
}
119126

@@ -122,30 +129,30 @@ public void testBwcSerialization() throws Exception {
122129

123130
{
124131
final ForceMergeRequest sample = randomRequest();
125-
final Version compatibleVersion = VersionUtils.randomCompatibleVersion(random(), Version.CURRENT);
132+
final Version version = VersionUtils.randomCompatibleVersion(random(), Version.CURRENT);
126133
try (BytesStreamOutput out = new BytesStreamOutput()) {
127-
out.setVersion(Version.CURRENT);
134+
out.setVersion(version);
128135
sample.getParentTask().writeTo(out);
129136
out.writeStringArray(sample.indices());
130137
sample.indicesOptions().writeIndicesOptions(out);
131138
out.writeInt(sample.maxNumSegments());
132139
out.writeBoolean(sample.onlyExpungeDeletes());
133140
out.writeBoolean(sample.flush());
134-
if (compatibleVersion.onOrAfter(Version.V_2_13_0)) {
141+
if (version.onOrAfter(Version.V_2_13_0)) {
135142
out.writeBoolean(sample.primaryOnly());
136143
}
137144
out.writeOptionalString(sample.forceMergeUUID());
138145

139146
final ForceMergeRequest deserializedRequest;
140147
try (StreamInput in = out.bytes().streamInput()) {
141-
in.setVersion(compatibleVersion);
148+
in.setVersion(version);
142149
deserializedRequest = new ForceMergeRequest(in);
143150
}
144151

145152
assertEquals(sample.maxNumSegments(), deserializedRequest.maxNumSegments());
146153
assertEquals(sample.onlyExpungeDeletes(), deserializedRequest.onlyExpungeDeletes());
147154
assertEquals(sample.flush(), deserializedRequest.flush());
148-
if (compatibleVersion.onOrAfter(Version.V_2_13_0)) {
155+
if (version.onOrAfter(Version.V_2_13_0)) {
149156
assertEquals(sample.primaryOnly(), deserializedRequest.primaryOnly());
150157
}
151158
assertEquals(sample.forceMergeUUID(), deserializedRequest.forceMergeUUID());

0 commit comments

Comments
 (0)