Skip to content

Commit 9a7879a

Browse files
authored
Don't reset upper bounds (elastic#135226) (elastic#135303)
Transport version upper bounds are currently set to their values from upstream main whenever no new definition is detected. However, this is like a partial merge of upstream, and produces broken state files. This commit temporarily comments out resetting until a more robust solution is built.
1 parent 02c1ab6 commit 9a7879a

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/transport/TransportVersionGenerationFuncTest.groovy

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@ class TransportVersionGenerationFuncTest extends AbstractTransportVersionFuncTes
9090
assertUpperBound("9.2", "new_tv,8124000")
9191
}
9292

93+
/*
94+
temporarily muted, see https://github.com/elastic/elasticsearch/pull/135226
95+
9396
def "invalid changes to a upper bounds should be reverted"() {
9497
given:
9598
transportVersionUpperBound("9.2", "modification", "9000000")
@@ -144,7 +147,7 @@ class TransportVersionGenerationFuncTest extends AbstractTransportVersionFuncTes
144147
assertReferableDefinitionDoesNotExist("test_tv")
145148
assertUpperBound("9.2", "existing_92,8123000")
146149
assertUpperBound("9.1", "existing_92,8012001")
147-
}
150+
}*/
148151

149152
def "a reference can be renamed"() {
150153
given:
@@ -242,8 +245,11 @@ class TransportVersionGenerationFuncTest extends AbstractTransportVersionFuncTes
242245
def "unreferenced definitions are removed"() {
243246
given:
244247
referableTransportVersion("test_tv", "8124000,8012002")
248+
/*
249+
TODO: reset of upper bounds
245250
transportVersionUpperBound("9.2", "test_tv", "8124000")
246251
transportVersionUpperBound("9.1", "test_tv", "8012002")
252+
*/
247253

248254
when:
249255
def result = runGenerateAndValidateTask().build()
@@ -477,6 +483,8 @@ class TransportVersionGenerationFuncTest extends AbstractTransportVersionFuncTes
477483
assertUpperBound("9.2", "new_tv,8124000")
478484
}
479485

486+
/*
487+
TODO: reset of upper bounds
480488
def "deleted upper bounds files are restored"() {
481489
given:
482490
file("myserver/src/main/resources/transport/upper_bounds/9.2.csv").delete()
@@ -487,7 +495,7 @@ class TransportVersionGenerationFuncTest extends AbstractTransportVersionFuncTes
487495
then:
488496
assertGenerateAndValidateSuccess(result)
489497
assertUpperBound("9.2", "existing_92,8123000")
490-
}
498+
}*/
491499

492500
def "upper bounds files must exist for backport branches"() {
493501
when:

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/GenerateTransportVersionDefinitionTask.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ public void run() throws IOException {
107107

108108
getLogger().lifecycle("Generating transport version name: " + targetDefinitionName);
109109
if (targetDefinitionName.isEmpty()) {
110-
resetAllUpperBounds(resources);
110+
// TODO: resetting upper bounds needs to be done locally, otherwise it pulls in some (incomplete) changes from upstream main
111+
// resetAllUpperBounds(resources);
111112
} else {
112113
List<TransportVersionId> ids = updateUpperBounds(resources, upstreamUpperBounds, targetUpperBoundNames, targetDefinitionName);
113114
// (Re)write the definition file.

0 commit comments

Comments
 (0)