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

chore: backport master to 2.0 #20072

Merged
merged 38 commits into from
Nov 17, 2020
Merged

chore: backport master to 2.0 #20072

merged 38 commits into from
Nov 17, 2020

Conversation

danxmoran
Copy link
Contributor

Closes #19981
Closes #20030
Closes #20032
Closes #20038
Closes #20068

Probably the best way to view this PR is the diff between it and master:

$ git diff master
diff --git a/.circleci/config.yml b/.circleci/config.yml
index fa84a62c9a..2773ea2a51 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -491,7 +491,7 @@ workflows:
           filters:
             branches:
               only:
-                - master
+                - "2.0"
   e2e:
     jobs:
       - e2e
@@ -502,7 +502,7 @@ workflows:
           filters:
             branches:
               only:
-                - master
+                - "2.0"
     jobs:
       - e2e
   nightly:
@@ -512,7 +512,7 @@ workflows:
           filters:
             branches:
               only:
-                - master
+                - "2.0"
     jobs:
       - gotest
       - golint
@@ -527,7 +527,7 @@ workflows:
           filters:
             branches:
               only:
-                - master
+                - "2.0"
       - litmus_nightly:
           requires:
             - deploy-nightly
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46d583d1ae..e807cce27c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## unreleased
+## v2.0.2 [unreleased]

 ### Features


danxmoran and others added 30 commits November 17, 2020 13:46
The commit will be re-added in a later patch, to restore history
to the correct order.
This commit fixes a locking issue that caused the `TestShard_WritePoints_FieldConflictConcurrent`
test to fail.
This resolves observed race conditions when running test suites that
utilize the launcher. It also reduces test times considerably, by
eliminating a slow loop to find a port.
This includes removal of a lot of kv.Service responsibilities. However,
it does not finish the re-wiring. It removes documents, telegrafs,
notification rules + endpoints, checks, orgs, users, buckets, passwords,
urms, labels and authorizations. There are some oustanding pieces that
are needed to get kv service compiling (dashboard service urm
dependency). Then all the call sites for kv service need updating and
the new implementations of telegraf and notification rules + endpoints
needed installing (along with any necessary migrations).
I have it on good authority this is going away (or is being updated to
not make the same assertions) in a upcoming PR. The way dashboards load
templates has changed and it no longer relies on needing to POST to the
templates endpoint. So the way this test is structured is void.
This package provides essentially the same API as the Cloud tests
package, utilising the `TestLauncher` type.

Additional With functional options were added to the `Launcher`
in order to expose type-safe configuration of InfluxQL configuration.
Additional With options may be added in the future as the need arises.
This commit copies over the comprehensive tests from Cloud.
This is useful for validating InfluxQL DDL queries that don't
typically require writes or may have more complex setup requirements.
CHANGELOG.md Show resolved Hide resolved
Copy link
Contributor

@psteinbachs psteinbachs left a comment

Choose a reason for hiding this comment

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

This looks really good.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment