Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mark reset service tests as flaky #9602

Merged
merged 1 commit into from
May 6, 2021
Merged

Mark reset service tests as flaky #9602

merged 1 commit into from
May 6, 2021

Conversation

cocreature
Copy link
Contributor

changelog_begin
changelog_end

Pull Request Checklist

  • Read and understand the contribution guidelines
  • Include appropriate tests
  • Set a descriptive title and thorough description
  • Add a reference to the issue this PR will solve, if appropriate
  • Include changelog additions in one or more commit message bodies between the CHANGELOG_BEGIN and CHANGELOG_END tags
  • Normal production system change, include purpose of change in description

NOTE: CI is not automatically run on non-members pull-requests for security
reasons. The reviewer will have to comment with /AzurePipelines run to
trigger the build.

@cocreature cocreature force-pushed the reset-macos branch 3 times, most recently from 4b1f7fe to 401136f Compare May 6, 2021 16:30
Reset service is cursed

changelog_begin
changelog_end
@cocreature cocreature changed the title debug reset service d3e31e33cf2f2933b0fde5412359a98a92f19084 May 6, 2021
@cocreature cocreature changed the title d3e31e33cf2f2933b0fde5412359a98a92f19084 Mark reset service tests as flaky May 6, 2021
@cocreature cocreature marked this pull request as ready for review May 6, 2021 16:39
Comment on lines +270 to +283
for (suffix, pattern, exclusions, flaky) in [
(
"",
"src/test/suite/**/*.scala",
[reset_service_pattern],
False,
),
(
"-resetservice",
reset_service_pattern,
[],
True,
),
]
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems… overkill. Why not just duplicate? It'd be basically the same amount of code and I wouldn't have to do the variable interpolation in my head.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because I don’t want to have to worry about them getting out of sync over time. This make it very clear that they don’t.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don’t feel super strongly about this though so if you disagree, I can duplicate instead.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair enough. I can deal. You decide. 🙂

Comment on lines +231 to +244
for (suffix, pattern, exclusions, flaky) in [
(
"",
"src/test/suite/**/*.scala",
[reset_service_pattern],
False,
),
(
"-resetservice",
reset_service_pattern,
[],
True,
),
]
Copy link

@ghost ghost May 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto. Except extract a couple variables for dependencies.

@mergify mergify bot merged commit e68bc0d into main May 6, 2021
@mergify mergify bot deleted the reset-macos branch May 6, 2021 17:15
azure-pipelines bot pushed a commit that referenced this pull request May 12, 2021
This PR has been created by a script, which is not very smart
and does not have all the context. Please do double-check that
the version prefix is correct before merging.

@victormueller-da is in charge of this release.

Commit log:
```
ca9e89b check whether collection.compat is unused when compiling for Scala 2.12 (#9604)
4a46097 Block concurrent SDK installations. (#9640)
c757b61 Check byKey in transaction validation (#9641)
4f0ceff Fix #7170 (#9618)
d310668 Add a REPL for each Scala target, for debugging. (#9643)
22b36b0 Include byKey in LF transaction spec (#9642)
ca027e3 Add Transaction.contractKeyInputs to inputs of a transaction (#9631)
c3d79d4 Allow OverloadedLists in data-dependencies (#9636)
f8b35fe Cleans stateUpdates of ReadWriteServiceBridge (#9630)
3750b16 Serializalize byKey flag in Daml-LF transactions (#9632)
3b59f8c ledger-api-bench-tool - prototype [DPP-370] (#9606)
f7b33d9 Authorization for daml script exports (#9629)
0d1f3db LF: refactor builtin exceptions in Speedy (#9605)
d6d01b0 Swap order SEScopeExercise and SBUBeginExercise (#9621)
6c919b3 sandbox-on-x: Support `beginAfter` in state updates. (#9624)
26a8011 TLS for Daml Script exports (#9626)
9242540 Make error throw a GeneralError. (#9613)
bdcf0ec update NOTICES file (#9623)
4c1fbeb Add duplicate contract key checks to Speedy (#9607)
871279f LF: extends LF command with Fetch and Lookup  (#9587)
0acc4f1 Patch old Bazel derivation (#9622)
b082274 Address vulnerabilities in Navigator (#9617)
560653a Unwind partial transaction on mustFail (#9608)
f51145c Support mapping from old to new party ids in daml exports (#9591)
89e46bf Address security vulnerabilities in //compiler/daml-extension (#9615)
fd62671 Introduce SINCE-LF-FEATURE in integration tests. (#9616)
48939b5 Address vulnerabilities in //language-support/ts/packages (#9614)
cf59246 Add support for daml exceptions for append-only indexer (#9609)
ab29f7c Move activeness check of globalKeyInputs into archive (#9610)
5c28de3 Upgrade grunt to address cve (#9611)
22ba5fd Remove builtin exception types from protobuf and ASTs. (#9595)
b09a95f Adapt indexer to empty divulgences (#9598)
2fc7489 Filter divulgence to an empty set of parties (#9600)
ad45213 participant-integration-api: Avoid the serial EC in integration testing. (#9603)
f742a43 Dpp 336 sandbox classic on append only (#9561)
e68bc0d Mark reset service tests as flaky (#9602)
2176173 Remove 1.dev-only things from LF 1.13 protofile. (#9599)
03034ec DPP-359 Add indexer flow level benchmark (#9509)
5aa5401 Drop todo for conversion of exception primitives (#9597)
968b5d8 KVL-921 Expose opentelemetry Context from Telemetry and TelemetryContext (#9573)
112c387 Refactor out setGlobalLogLevel into ContextualLogging (#9592)
e584fec Drop com.daml.lf.engine.Event.collectEvents (#9596)
80b07da Only archive a key if it was brought into scope before (#9546)
7ea9340 Support old bash in daml-sdk-head (#9593)
45fbdef Handle rollback nodes in protoNodeInfo (#9589)
42d189d Support exceptions in Daml-LF encoder (#9590)
9c3913a LF: SBUKeyBuiltin clean up. (#9572)
5128206 Ledger API Server: Named threadpools (#9588)
26a53d8 Add logging command line option to ledger http service (#9581)
409833f Address rollback todo in ancient migration (#9583)
a27b2c5 Address more exception todos (#9582)
2040556 Support rollback nodes in replay adapter (#9584)
192a77a update compat versions for 1.13.0-snapshot.20210504.6833.0.9ae787d0 (#9575)
81d508b LF: make SBuiltins pure (#9580)
de80a6d Drop ValueBuiltinException (#9576)
1c456be Release yet another 1.13 snapshot (#9574)
8009891 Disable migration tests on macos on PRs (#9571)
2e93de7 Fix recording exceptions in Spans, add unit tests [KVL-874] (#9544)
121ded3 Accept a comma-separated list of parties for daml ledger export (#9568)
```
Changelog:
```
- [Daml Assistant] The assistant will now avoid
  installing SDK versions concurrently, waiting
  for the previous installation to finish before
  starting the next installation (if still
  necessary). This fixes a bug where the SDK
  would become corrupted because two
  installations were started concurrently.
http-json:
- add contextual id as logging context to distinguish different application runs in logs
- add request id as logging context to distinguish different http requests within an application run
- add for non-static endpoints trace logs which show how long processing it took in ns
- [Integration Kit] - Created the ledger-api-bench-tool prototype for benchmarking ledger transaction streaming capabilities
* [Daml export] Users can now define a mapping from parties in the
  original ledger state to parties to be used when recontructing the
  ledger state. The ``parties`` component of the argument to the
  generated export script now takes a mapping from old party name to new
  party name.
- [Ledger HTTP Json Service] Logging now also tells service name if log level was changed.
- [Ledger HTTP Json service] Logging can now be configured via the `--log-level` cli argument. Valid values are `error`, `warn`, `info` (default), `debug`, `trace`
```

CHANGELOG_BEGIN
CHANGELOG_END
realvictorprm added a commit that referenced this pull request May 12, 2021
* release 1.13.0-snapshot.20210511.6892.0.ca9e89b3

This PR has been created by a script, which is not very smart
and does not have all the context. Please do double-check that
the version prefix is correct before merging.

@victormueller-da is in charge of this release.

Commit log:
```
ca9e89b check whether collection.compat is unused when compiling for Scala 2.12 (#9604)
4a46097 Block concurrent SDK installations. (#9640)
c757b61 Check byKey in transaction validation (#9641)
4f0ceff Fix #7170 (#9618)
d310668 Add a REPL for each Scala target, for debugging. (#9643)
22b36b0 Include byKey in LF transaction spec (#9642)
ca027e3 Add Transaction.contractKeyInputs to inputs of a transaction (#9631)
c3d79d4 Allow OverloadedLists in data-dependencies (#9636)
f8b35fe Cleans stateUpdates of ReadWriteServiceBridge (#9630)
3750b16 Serializalize byKey flag in Daml-LF transactions (#9632)
3b59f8c ledger-api-bench-tool - prototype [DPP-370] (#9606)
f7b33d9 Authorization for daml script exports (#9629)
0d1f3db LF: refactor builtin exceptions in Speedy (#9605)
d6d01b0 Swap order SEScopeExercise and SBUBeginExercise (#9621)
6c919b3 sandbox-on-x: Support `beginAfter` in state updates. (#9624)
26a8011 TLS for Daml Script exports (#9626)
9242540 Make error throw a GeneralError. (#9613)
bdcf0ec update NOTICES file (#9623)
4c1fbeb Add duplicate contract key checks to Speedy (#9607)
871279f LF: extends LF command with Fetch and Lookup  (#9587)
0acc4f1 Patch old Bazel derivation (#9622)
b082274 Address vulnerabilities in Navigator (#9617)
560653a Unwind partial transaction on mustFail (#9608)
f51145c Support mapping from old to new party ids in daml exports (#9591)
89e46bf Address security vulnerabilities in //compiler/daml-extension (#9615)
fd62671 Introduce SINCE-LF-FEATURE in integration tests. (#9616)
48939b5 Address vulnerabilities in //language-support/ts/packages (#9614)
cf59246 Add support for daml exceptions for append-only indexer (#9609)
ab29f7c Move activeness check of globalKeyInputs into archive (#9610)
5c28de3 Upgrade grunt to address cve (#9611)
22ba5fd Remove builtin exception types from protobuf and ASTs. (#9595)
b09a95f Adapt indexer to empty divulgences (#9598)
2fc7489 Filter divulgence to an empty set of parties (#9600)
ad45213 participant-integration-api: Avoid the serial EC in integration testing. (#9603)
f742a43 Dpp 336 sandbox classic on append only (#9561)
e68bc0d Mark reset service tests as flaky (#9602)
2176173 Remove 1.dev-only things from LF 1.13 protofile. (#9599)
03034ec DPP-359 Add indexer flow level benchmark (#9509)
5aa5401 Drop todo for conversion of exception primitives (#9597)
968b5d8 KVL-921 Expose opentelemetry Context from Telemetry and TelemetryContext (#9573)
112c387 Refactor out setGlobalLogLevel into ContextualLogging (#9592)
e584fec Drop com.daml.lf.engine.Event.collectEvents (#9596)
80b07da Only archive a key if it was brought into scope before (#9546)
7ea9340 Support old bash in daml-sdk-head (#9593)
45fbdef Handle rollback nodes in protoNodeInfo (#9589)
42d189d Support exceptions in Daml-LF encoder (#9590)
9c3913a LF: SBUKeyBuiltin clean up. (#9572)
5128206 Ledger API Server: Named threadpools (#9588)
26a53d8 Add logging command line option to ledger http service (#9581)
409833f Address rollback todo in ancient migration (#9583)
a27b2c5 Address more exception todos (#9582)
2040556 Support rollback nodes in replay adapter (#9584)
192a77a update compat versions for 1.13.0-snapshot.20210504.6833.0.9ae787d0 (#9575)
81d508b LF: make SBuiltins pure (#9580)
de80a6d Drop ValueBuiltinException (#9576)
1c456be Release yet another 1.13 snapshot (#9574)
8009891 Disable migration tests on macos on PRs (#9571)
2e93de7 Fix recording exceptions in Spans, add unit tests [KVL-874] (#9544)
121ded3 Accept a comma-separated list of parties for daml ledger export (#9568)
```
Changelog:
```
- [Daml Assistant] The assistant will now avoid
  installing SDK versions concurrently, waiting
  for the previous installation to finish before
  starting the next installation (if still
  necessary). This fixes a bug where the SDK
  would become corrupted because two
  installations were started concurrently.
http-json:
- add contextual id as logging context to distinguish different application runs in logs
- add request id as logging context to distinguish different http requests within an application run
- add for non-static endpoints trace logs which show how long processing it took in ns
- [Integration Kit] - Created the ledger-api-bench-tool prototype for benchmarking ledger transaction streaming capabilities
* [Daml export] Users can now define a mapping from parties in the
  original ledger state to parties to be used when recontructing the
  ledger state. The ``parties`` component of the argument to the
  generated export script now takes a mapping from old party name to new
  party name.
- [Ledger HTTP Json Service] Logging now also tells service name if log level was changed.
- [Ledger HTTP Json service] Logging can now be configured via the `--log-level` cli argument. Valid values are `error`, `warn`, `info` (default), `debug`, `trace`
```

CHANGELOG_BEGIN
CHANGELOG_END

* Release snapshot 1.14.0
changelog_begin
changelog_end

Co-authored-by: Azure Pipelines DAML Build <support@digitalasset.com>
Co-authored-by: victor.mueller@digitalasset.com <mueller.vpr@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant