Rewrite GraphQL schema generation and query parsing (close #2801) (#4111)
Aka “the PDV refactor.” History is preserved on the branch 2801-graphql-schema-parser-refactor.
* [skip ci] remove stale benchmark commit from commit_diff
* [skip ci] Check for root field name conflicts between remotes
* [skip ci] Additionally check for conflicts between remotes and DB
* [skip ci] Check for conflicts in schema when tracking a table
* [skip ci] Fix equality checking in GraphQL AST
* server: fix mishandling of GeoJSON inputs in subscriptions (fix #3239) (#4551)
* Add support for multiple top-level fields in a subscription to improve testability of subscriptions
* Add an internal flag to enable multiple subscriptions
* Add missing call to withConstructorFn in live queries (fix #3239)
Co-authored-by: Alexis King <lexi.lambda@gmail.com>
* Scheduled triggers (close #1914) (#3553)
server: add scheduled triggers
Co-authored-by: Alexis King <lexi.lambda@gmail.com>
Co-authored-by: Marion Schleifer <marion@hasura.io>
Co-authored-by: Karthikeyan Chinnakonda <karthikeyan@hasura.io>
Co-authored-by: Aleksandra Sikora <ola.zxcvbnm@gmail.com>
* dev.sh: bump version due to addition of croniter python dependency
* server: fix an introspection query caching issue (fix #4547) (#4661)
Introspection queries accept variables, but we need to make sure to
also touch the variables that we ignore, so that an introspection
query is marked not reusable if we are not able to build a correct
query plan for it.
A better solution here would be to deal with such unused variables
correctly, so that more introspection queries become reusable.
An even better solution would be to type-safely track *how* to reuse
which variables, rather than to split the reusage marking from the
planning.
Co-authored-by: Tirumarai Selvan <tiru@hasura.io>
* flush log buffer on exception in mkWaiApp ( fix #4772 ) (#4801)
* flush log buffer on exception in mkWaiApp
* add comment to explain the introduced change
* add changelog
* allow logging details of a live query polling thread (#4959)
* changes for poller-log
add various multiplexed query info in poller-log
* minor cleanup, also fixes a bug which will return duplicate data
* Live query poller stats can now be logged
This also removes in-memory stats that are collected about batched
query execution as the log lines when piped into an monitoring tool
will give us better insights.
* allow poller-log to be configurable
* log minimal information in the livequery-poller-log
Other information can be retrieved from /dev/subscriptions/extended
* fix few review comments
* avoid marshalling and unmarshalling from ByteString to EncJSON
* separate out SubscriberId and SubscriberMetadata
Co-authored-by: Anon Ray <rayanon004@gmail.com>
* Don't compile in developer APIs by default
* Tighten up handling of admin secret, more docs
Store the admin secret only as a hash to prevent leaking the secret
inadvertently, and to prevent timing attacks on the secret.
NOTE: best practice for stored user passwords is a function with a
tunable cost like bcrypt, but our threat model is quite different (even
if we thought we could reasonably protect the secret from an attacker
who could read arbitrary regions of memory), and bcrypt is far too slow
(by design) to perform on each request. We'd have to rely on our
(technically savvy) users to choose high entropy passwords in any case.
Referencing #4736
* server/docs: add instructions to fix loss of float precision in PostgreSQL <= 11 (#5187)
This adds a server flag, --pg-connection-options, that can be used to set a PostgreSQL connection parameter, extra_float_digits, that needs to be used to avoid loss of data on older versions of PostgreSQL, which have odd default behavior when returning float values. (fixes #5092)
* [skip ci] Add new commits from master to the commit diff
* [skip ci] serve default directives (skip & include) over introspection
* [skip ci] Update non-Haskell assets with the version on master
* server: refactor GQL execution check and config API (#5094)
Co-authored-by: Vamshi Surabhi <vamshi@hasura.io>
Co-authored-by: Vamshi Surabhi <0x777@users.noreply.github.com>
* [skip ci] fix js issues in tests by pinning dependencies version
* [skip ci] bump graphql version
* [skip ci] Add note about memory usage
* generalize query execution logic on Postgres (#5110)
* generalize PGExecCtx to support specialized functions for various operations
* fix tests compilation
* allow customising PGExecCtx when starting the web server
* server: changes catalog initialization and logging for pro customization (#5139)
* new typeclass to abstract the logic of QueryLog-ing
* abstract the logic of logging websocket-server logs
introduce a MonadWSLog typeclass
* move catalog initialization to init step
expose a helper function to migrate catalog
create schema cache in initialiseCtx
* expose various modules and functions for pro
* [skip ci] cosmetic change
* [skip ci] fix test calling a mutation that does not exist
* [skip ci] minor text change
* [skip ci] refactored input values
* [skip ci] remove VString Origin
* server: fix updating of headers behaviour in the update cron trigger API and create future events immediately (#5151)
* server: fix bug to update headers in an existing cron trigger and create future events
Co-authored-by: Tirumarai Selvan <tiru@hasura.io>
* Lower stack chunk size in RTS to reduce thread STACK memory (closes #5190)
This reduces memory consumption for new idle subscriptions significantly
(see linked ticket).
The hypothesis is: we fork a lot of threads per websocket, and some of
these use slightly more than the initial 1K stack size, so the first
overflow balloons to 32K, when significantly less is required.
However: running with `+RTS -K1K -xc` did not seem to show evidence of
any overflows! So it's a mystery why this improves things.
GHC should probably also be doubling the stack buffer at each overflow
or doing something even smarter; the knobs we have aren't so helpful.
* [skip ci] fix todo and schema generation for aggregate fields
* 5087 libpq pool leak (#5089)
Shrink libpq buffers to 1MB before returning connection to pool. Closes #5087
See: https://github.com/hasura/pg-client-hs/pull/19
Also related: #3388 #4077
* bump pg-client-hs version (fixes a build issue on some environments) (#5267)
* do not use prepared statements for mutations
* server: unlock scheduled events on graceful shutdown (#4928)
* Fix buggy parsing of new --conn-lifetime flag in 2b0e3774
* [skip ci] remove cherry-picked commit from commit_diff.txt
* server: include additional fields in scheduled trigger webhook payload (#5262)
* include scheduled triggers metadata in the webhook body
Co-authored-by: Tirumarai Selvan <tiru@hasura.io>
* server: call the webhook asynchronously in event triggers (#5352)
* server: call the webhook asynchronosly in event triggers
* Expose all modules in Cabal file (#5371)
* [skip ci] update commit_diff.txt
* [skip ci] fix cast exp parser & few TODOs
* [skip ci] fix remote fields arguments
* [skip ci] fix few more TODO, no-op refactor, move resolve/action.hs to execute/action.hs
* Pass environment variables around as a data structure, via @sordina (#5374)
* Pass environment variables around as a data structure, via @sordina
* Resolving build error
* Adding Environment passing note to changelog
* Removing references to ILTPollerLog as this seems to have been reintroduced from a bad merge
* removing commented-out imports
* Language pragmas already set by project
* Linking async thread
* Apply suggestions from code review
Use `runQueryTx` instead of `runLazyTx` for queries.
* remove the non-user facing entry in the changelog
Co-authored-by: Phil Freeman <paf31@cantab.net>
Co-authored-by: Phil Freeman <phil@hasura.io>
Co-authored-by: Vamshi Surabhi <0x777@users.noreply.github.com>
* [skip ci] fix: restrict remote relationship field generation for hasura queries
* [skip ci] no-op refactor; move insert execution code from schema parser module
* server: call the webhook asynchronously in event triggers (#5352)
* server: call the webhook asynchronosly in event triggers
* Expose all modules in Cabal file (#5371)
* [skip ci] update commit_diff.txt
* Pass environment variables around as a data structure, via @sordina (#5374)
* Pass environment variables around as a data structure, via @sordina
* Resolving build error
* Adding Environment passing note to changelog
* Removing references to ILTPollerLog as this seems to have been reintroduced from a bad merge
* removing commented-out imports
* Language pragmas already set by project
* Linking async thread
* Apply suggestions from code review
Use `runQueryTx` instead of `runLazyTx` for queries.
* remove the non-user facing entry in the changelog
Co-authored-by: Phil Freeman <paf31@cantab.net>
Co-authored-by: Phil Freeman <phil@hasura.io>
Co-authored-by: Vamshi Surabhi <0x777@users.noreply.github.com>
* [skip ci] implement header checking
Probably closes #14 and #3659.
* server: refactor 'pollQuery' to have a hook to process 'PollDetails' (#5391)
Co-authored-by: Vamshi Surabhi <0x777@users.noreply.github.com>
* update pg-client (#5421)
* [skip ci] update commit_diff
* Fix latency buckets for telemetry data
These must have gotten messed up during a refactor. As a consequence
almost all samples received so far fall into the single erroneous 0 to
1K seconds (originally supposed to be 1ms?) bucket.
I also re-thought what the numbers should be, but these are still
arbitrary and might want adjusting in the future.
* [skip ci] include the latest commit compared against master in commit_diff
* [skip ci] include new commits from master in commit_diff
* [skip ci] improve description generation
* [skip ci] sort all introspect arrays
* [skip ci] allow parsers to specify error codes
* [skip ci] fix integer and float parsing error code
* [skip ci] scalar from json errors are now parse errors
* [skip ci] fixed negative integer error message and code
* [skip ci] Re-fix nullability in relationships
* [skip ci] no-op refactor and removed couple of FIXMEs
* [skip ci] uncomment code in 'deleteMetadataObject'
* [skip ci] Fix re-fix of nullability for relationships
* [skip ci] fix default arguments error code
* [skip ci] updated test error message
!!! WARNING !!!
Since all fields accept `null`, they all are technically optional in
the new schema. Meaning there's no such thing as a missing mandatory
field anymore: a field that doesn't have a default value, and which
therefore isn't labelled as "optional" in the schema, will be assumed
to be null if it's missing, meaning it isn't possible anymore to have
an error for a missing mandatory field. The only possible error is now
when a optional positional argument is omitted but is not the last
positional argument.
* [skip ci] cleanup of int scalar parser
* [skip ci] retro-compatibility of offset as string
* [skip ci] Remove commit from commit_diff.txt
Although strictly speaking we don't know if this will work correctly in PDV
if we would implement query plan caching, the fact is that in the theoretical
case that we would have the same issue in PDV, it would probably apply not just
to introspection, and the fix would be written completely differently. So this
old commit is of no value to us other than the heads-up "make sure query plan
caching works correctly even in the presence of unused variables", which is
already part of the test suite.
* Add MonadTrace and MonadExecuteQuery abstractions (#5383)
* [skip ci] Fix accumulation of input object types
Just like object types, interface types, and union types, we have to avoid
circularities when collecting input types from the GraphQL AST.
Additionally, this fixes equality checks for input object types (whose fields
are unordered, and hence should be compared as sets) and enum types (ditto).
* [skip ci] fix fragment error path
* [skip ci] fix node error code
* [skip ci] fix paths in insert queries
* [skip ci] fix path in objects
* [skip ci] manually alter node id path for consistency
* [skip ci] more node error fixups
* [skip ci] one last relay error message fix
* [skip ci] update commit_diff
* Propagate the trace context to event triggers (#5409)
* Propagate the trace context to event triggers
* Handle missing trace and span IDs
* Store trace context as one LOCAL
* Add migrations
* Documentation
* changelog
* Fix warnings
* Respond to code review suggestions
* Respond to code review
* Undo changelog
* Update CHANGELOG.md
Co-authored-by: Vamshi Surabhi <0x777@users.noreply.github.com>
* server: log request/response sizes for event triggers (#5463)
* server: log request/response sizes for event triggers
event triggers (and scheduled triggers) now have request/response size
in their logs.
* add changelog entry
* Tracing: Simplify HTTP traced request (#5451)
Remove the Inversion of Control (SuspendRequest) and simplify
the tracing of HTTP Requests.
Co-authored-by: Phil Freeman <phil@hasura.io>
* Attach request ID as tracing metadata (#5456)
* Propagate the trace context to event triggers
* Handle missing trace and span IDs
* Store trace context as one LOCAL
* Add migrations
* Documentation
* Include the request ID as trace metadata
* changelog
* Fix warnings
* Respond to code review suggestions
* Respond to code review
* Undo changelog
* Update CHANGELOG.md
* Typo
Co-authored-by: Vamshi Surabhi <0x777@users.noreply.github.com>
* server: add logging for action handlers (#5471)
* server: add logging for action handlers
* add changelog entry
* change action-handler log type from internal to non-internal
* fix action-handler-log name
* server: pass http and websocket request to logging context (#5470)
* pass request body to logging context in all cases
* add message size logging on the websocket API
this is required by graphql-engine-pro/#416
* message size logging on websocket API
As we need to log all messages recieved/sent by the websocket server,
it makes sense to log them as part of the websocket server event logs.
Previously message recieved were logged inside the onMessage handler,
and messages sent were logged only for "data" messages (as a server event log)
* fix review comments
Co-authored-by: Phil Freeman <phil@hasura.io>
* server: stop eventing subsystem threads when shutting down (#5479)
* server: stop eventing subsystem threads when shutting down
* Apply suggestions from code review
Co-authored-by: Karthikeyan Chinnakonda <chkarthikeyan95@gmail.com>
Co-authored-by: Phil Freeman <phil@hasura.io>
Co-authored-by: Phil Freeman <paf31@cantab.net>
Co-authored-by: Karthikeyan Chinnakonda <chkarthikeyan95@gmail.com>
* [skip ci] update commit_diff with new commits added in master
* Bugfix to support 0-size HASURA_GRAPHQL_QUERY_PLAN_CACHE_SIZE
Also some minor refactoring of bounded cache module:
- the maxBound check in `trim` was confusing and unnecessary
- consequently trim was unnecessary for lookupPure
Also add some basic tests
* Support only the bounded cache, with default HASURA_GRAPHQL_QUERY_PLAN_CACHE_SIZE of 4000. Closes #5363
* [skip ci] remove merge commit from commit_diff
* server: Fix compiler warning caused by GHC upgrade (#5489)
Co-authored-by: Vamshi Surabhi <0x777@users.noreply.github.com>
* [skip ci] update all non server code from master
* [skip ci] aligned object field error message with master
* [skip ci] fix remaining undefined?
* [skip ci] remove unused import
* [skip ci] revert to previous error message, fix tests
* Move nullableType/nonNullableType to Schema.hs
These are functions on Types, not on Parsers.
* [skip ci] fix setup to fix backend only test
the order in which permission checks are performed on the branch is
slightly different than on master, resulting in a slightly different
error if there are no other mutations the user has access to. By
adding update permissions, we go back to the expected case.
* [skip ci] fix insert geojson tests to reflect new paths
* [skip ci] fix enum test for better error message
* [skip ci] fix header test for better error message
* [skip ci] fix fragment cycle test for better error message
* [skip ci] fix error message for type mismatch
* [skip ci] fix variable path in test
* [skip ci] adjust tests after bug fix
* [skip ci] more tests fixing
* Add hdb_catalog.current_setting abstraction for reading Hasura settings
As the comment in the function’s definition explains, this is needed to
work around an awkward Postgres behavior.
* [skip ci] Update CONTRIBUTING.md to mention Node setup for Python tests
* [skip ci] Add missing Python tests env var to CONTRIBUTING.md
* [skip ci] fix order of result when subscription is run with multiple nodes
* [skip ci] no-op refactor: fix a warning in Internal/Parser.hs
* [skip ci] throw error when a subscription contains remote joins
* [skip ci] Enable easier profiling by hiding AssertNF behind a flag
In order to compile a profiling build, run:
$ cabal new-build -f profiling --enable-profiling
* [skip ci] Fix two warnings
We used to lookup the objects that implement a given interface by filtering all
objects in the schema document. However, one of the tests expects us to
generate a warning if the provided `implements` field of an introspection query
specifies an object not implementing some interface. So we use that field
instead.
* [skip ci] Fix warnings by commenting out query plan caching
* [skip ci] improve masking/commenting query caching related code & few warning fixes
* [skip ci] Fixed compiler warnings in graphql-parser-hs
* Sync non-Haskell assets with master
* [skip ci] add a test inserting invalid GraphQL but valid JSON value in a jsonb column
* [skip ci] Avoid converting to/from Map
* [skip ci] Apply some hlint suggestions
* [skip ci] remove redundant constraints from buildLiveQueryPlan and explainGQLQuery
* [skip ci] add NOTEs about missing Tracing constraints in PDV from master
* Remove -fdefer-typed-holes, fix warnings
* Update cabal.project.freeze
* Limit GHC’s heap size to 8GB in CI to avoid the OOM killer
* Commit package-lock.json for Python tests’ remote schema server
* restrict env variables start with HASURA_GRAPHQL_ for headers configuration in actions, event triggers & remote schemas (#5519)
* restrict env variables start with HASURA_GRAPHQL_ for headers definition in actions & event triggers
* update CHANGELOG.md
* Apply suggestions from code review
Co-authored-by: Vamshi Surabhi <0x777@users.noreply.github.com>
* add test for table_by_pk node when roles doesn't have permission to PK
* [skip ci] fix introspection query if any enum column present in primary key (fix #5200) (#5522)
* [skip ci] test case fix for a6450e126bc2d98bcfd3791501986e4627ce6c6f
* [skip ci] add tests to agg queries when role doesn't have access to any cols
* fix backend test
* Simplify subscription execution
* [skip ci] add test to check if required headers are present while querying
* Suppose, table B is related to table A and to query B certain headers are
necessary, then the test checks that we are throwing error when the header
is not set when B is queried through A
* fix mutations not checking for view mutability
* [skip ci] add variable type checking and corresponding tests
* [skip ci] add test to check if update headers are present while doing an upsert
* [skip ci] add positive counterparts to some of the negative permission tests
* fix args missing their description in introspect
* [skip ci] Remove unused function; insert missing markNotReusable call
* [skip ci] Add a Note about InputValue
* [skip ci] Delete LegacySchema/ 🎉
* [skip ci] Delete GraphQL/{Resolve,Validate}/ 🎉
* [skip ci] Delete top-level Resolve/Validate modules; tidy .cabal file
* [skip ci] Delete LegacySchema top-level module
Somehow I missed this one.
* fix input value to json
* [skip ci] elaborate on JSON objects in GraphQL
* [skip ci] add missing file
* [skip ci] add a test with subscription containing remote joins
* add a test with remote joins in mutation output
* [skip ci] Add some comments to Schema/Mutation.hs
* [skip ci] Remove no longer needed code from RemoteServer.hs
* [skip ci] Use a helper function to generate conflict clause parsers
* [skip ci] fix type checker error in fields with default value
* capitalize the header keys in select_articles_without_required_headers
* Somehow, this was the reason the tests were failing. I have no idea, why!
* [skip ci] Add a long Note about optional fields and nullability
* Improve comments a bit; simplify Schema/Common.hs a bit
* [skip ci] full implementation of 5.8.5 type checking.
* [skip ci] fix validation test teardown
* [skip ci] fix schema stitching test
* fix remote schema ignoring enum nullability
* [skip ci] fix fieldOptional to not discard nullability
* revert nullability of use_spheroid
* fix comment
* add required remote fields with arguments for tests
* [skip ci] add missing docstrings
* [skip ci] fixed description of remote fields
* [skip ci] change docstring for consistency
* fix several schema inconsistencies
* revert behaviour change in function arguments parsing
* fix remaining nullability issues in new schema
* minor no-op refactor; use isListType from graphql-parser-hs
* use nullability of remote schema node, while creating a Remote reln
* fix 'ID' input coercing & action 'ID' type relationship mapping
* include ASTs in MonadExecuteQuery
* needed for PRO code-base
* Delete code for "interfaces implementing ifaces" (draft GraphQL spec)
Previously I started writing some code that adds support for a future GraphQL
feature where interfaces may themselves be sub-types of other interfaces.
However, this code was incomplete, and partially incorrect. So this commit
deletes support for that entirely.
* Ignore a remote schema test during the upgrade/downgrade test
The PDV refactor does a better job at exposing a minimal set of types through
introspection. In particular, not every type that is present in a remote schema
is re-exposed by Hasura. The test
test_schema_stitching.py::TestRemoteSchemaBasic::test_introspection assumed that
all types were re-exposed, which is not required for GraphQL compatibility, in
order to test some aspect of our support for remote schemas.
So while this particular test has been updated on PDV, the PDV branch now does
not pass the old test, which we argue to be incorrect. Hence this test is
disabled while we await a release, after which we can re-enable it.
This also re-enables a test that was previously disabled for similar, though
unrelated, reasons.
* add haddock documentation to the action's field parsers
* Deslecting some tests in server-upgrade
Some tests with current build are failing on server upgrade
which it should not. The response is more accurate than
what it was.
Also the upgrade tests were not throwing errors when the test is
expected to return an error, but succeeds. The test framework is
patched to catch this case.
* [skip ci] Add a long Note about interfaces and object types
* send the response headers back to client after running a query
* Deselect a few more tests during upgrade/downgrade test
* Update commit_diff.txt
* change log kind from db_migrate to catalog_migrate (#5531)
* Show method and complete URI in traced HTTP calls (#5525)
Co-authored-by: Vamshi Surabhi <0x777@users.noreply.github.com>
* restrict env variables start with HASURA_GRAPHQL_ for headers configuration in actions, event triggers & remote schemas (#5519)
* restrict env variables start with HASURA_GRAPHQL_ for headers definition in actions & event triggers
* update CHANGELOG.md
* Apply suggestions from code review
Co-authored-by: Vamshi Surabhi <0x777@users.noreply.github.com>
* fix introspection query if any enum column present in primary key (fix #5200) (#5522)
* Fix telemetry reporting of transport (websocket was reported as http)
* add log kinds in cli-migrations image (#5529)
* add log kinds in cli-migrations image
* give hint to resolve timeout error
* minor changes and CHANGELOG
* server: set hasura.tracecontext in RQL mutations [#5542] (#5555)
* server: set hasura.tracecontext in RQL mutations [#5542]
* Update test suite
Co-authored-by: Tirumarai Selvan <tiru@hasura.io>
* Add bulldozer auto-merge and -update configuration
We still need to add the github app (as of time of opening this PR)
Afterwards devs should be able to allow bulldozer to automatically
"update" the branch, merging in parent when it changes, as well as
automatically merge when all checks pass.
This is opt-in by adding the `auto-update-auto-merge` label to the PR.
* Remove 'bulldozer' config, try 'kodiak' for auto-merge
see: https://github.com/chdsbd/kodiak
The main issue that bit us was not being able to auto update forked
branches, also:
https://github.com/palantir/bulldozer/issues/66
https://github.com/palantir/bulldozer/issues/145
* Cherry-picked all commits
* [skip ci] Slightly improve formatting
* Revert "fix introspection query if any enum column present in primary key (fix #5200) (#5522)"
This reverts commit 0f9a5afa59a88f6824f4d63d58db246a5ba3fb03.
This undoes a cherry-pick of 34288e1eb5f2c5dad9e6d1e05453dd52397dc970 that was
already done previously in a6450e126bc2d98bcfd3791501986e4627ce6c6f, and
subsequently fixed for PDV in 70e89dc250f8ddc6e2b7930bbe2b3eeaa6dbe1db
* Do a small bit of tidying in Hasura.GraphQL.Parser.Collect
* Fix cherry-picking work
Some previous cherry-picks ended up modifying code that is commented out
* [skip ci] clarified comment regarding insert representation
* [skip ci] removed obsolete todos
* cosmetic change
* fix action error message
* [skip ci] remove obsolete comment
* [skip ci] synchronize stylish haskell extensions list
* use previously defined scalar names in parsers rather than ad-hoc literals
* Apply most syntax hlint hints.
* Clarify comment on update mutation.
* [skip ci] Clarify what fields should be specified for objects
* Update "_inc" description.
* Use record types rather than tuples fo IntrospectionResult and ParsedIntrospection
* Get rid of checkFieldNamesUnique (use Data.List.Extended.duplicates)
* Throw more errors when collecting query root names
* [skip ci] clean column parser comment
* Remove dead code inserted in ab65b39
* avoid converting to non-empty list where not needed
* add note and TODO about the disabled checks in PDV
* minor refactor in remoteField' function
* Unify two getObject methods
* Nitpicks in Remote.hs
* Update CHANGELOG.md
* Revert "Unify two getObject methods"
This reverts commit bd6bb40355b3d189a46c0312eb52225e18be57b3.
We do need two different getObject functions as the corresponding error message is different
* Fix error message in Remote.hs
* Update CHANGELOG.md
Co-authored-by: Auke Booij <auke@tulcod.com>
* Apply suggested Changelog fix.
Co-authored-by: Auke Booij <auke@tulcod.com>
* Fix typo in Changelog.
* [skip ci] Update changelog.
* reuse type names to avoid duplication
* Fix Hashable instance for Definition
The presence of `Maybe Unique`, and an optional description, as part of
`Definition`s, means that `Definition`s that are considered `Eq`ual may get
different hashes. This can happen, for instance, when one object is memoized
but another is not.
* [skip ci] Update commit_diff.txt
* Bump parser version.
* Bump freeze file after changes in parser.
* [skip ci] Incorporate commits from master
* Fix developer flag in server/cabal.project.freeze
Co-authored-by: Auke Booij <auke@tulcod.com>
* Deselect a changed ENUM test for upgrade/downgrade CI
* Deselect test here as well
* [skip ci] remove dead code
* Disable more tests for upgrade/downgrade
* Fix which test gets deselected
* Revert "Add hdb_catalog.current_setting abstraction for reading Hasura settings"
This reverts commit 66e85ab9fbd56cca2c28a80201f6604fbe811b85.
* Remove circular reference in cabal.project.freeze
Co-authored-by: Karthikeyan Chinnakonda <karthikeyan@hasura.io>
Co-authored-by: Auke Booij <auke@hasura.io>
Co-authored-by: Tirumarai Selvan <tiru@hasura.io>
Co-authored-by: Marion Schleifer <marion@hasura.io>
Co-authored-by: Aleksandra Sikora <ola.zxcvbnm@gmail.com>
Co-authored-by: Brandon Simmons <brandon.m.simmons@gmail.com>
Co-authored-by: Vamshi Surabhi <0x777@users.noreply.github.com>
Co-authored-by: Anon Ray <rayanon004@gmail.com>
Co-authored-by: rakeshkky <12475069+rakeshkky@users.noreply.github.com>
Co-authored-by: Anon Ray <ecthiender@users.noreply.github.com>
Co-authored-by: Vamshi Surabhi <vamshi@hasura.io>
Co-authored-by: Antoine Leblanc <antoine@hasura.io>
Co-authored-by: Brandon Simmons <brandon@hasura.io>
Co-authored-by: Phil Freeman <phil@hasura.io>
Co-authored-by: Lyndon Maydwell <lyndon@sordina.net>
Co-authored-by: Phil Freeman <paf31@cantab.net>
Co-authored-by: Naveen Naidu <naveennaidu479@gmail.com>
Co-authored-by: Karthikeyan Chinnakonda <chkarthikeyan95@gmail.com>
Co-authored-by: Nizar Malangadan <nizar-m@users.noreply.github.com>
Co-authored-by: Antoine Leblanc <crucuny@gmail.com>
Co-authored-by: Auke Booij <auke@tulcod.com>
2020-08-21 20:27:01 +03:00
|
|
|
{-# LANGUAGE CPP #-}
|
2022-03-16 03:39:21 +03:00
|
|
|
{-# LANGUAGE TemplateHaskell #-}
|
2021-09-24 01:56:37 +03:00
|
|
|
|
2019-03-12 08:46:27 +03:00
|
|
|
module Hasura.Server.SchemaUpdate
|
2020-11-24 09:10:04 +03:00
|
|
|
( startSchemaSyncListenerThread,
|
|
|
|
startSchemaSyncProcessorThread,
|
2022-11-06 01:37:04 +03:00
|
|
|
SchemaSyncThreadType (..),
|
2020-11-24 09:10:04 +03:00
|
|
|
)
|
2019-03-12 08:46:27 +03:00
|
|
|
where
|
|
|
|
|
2021-05-11 18:18:31 +03:00
|
|
|
import Control.Concurrent.Extended qualified as C
|
|
|
|
import Control.Concurrent.STM qualified as STM
|
|
|
|
import Control.Immortal qualified as Immortal
|
2021-06-08 15:55:18 +03:00
|
|
|
import Control.Monad.Loops qualified as L
|
2021-05-11 18:18:31 +03:00
|
|
|
import Control.Monad.Trans.Control (MonadBaseControl)
|
|
|
|
import Control.Monad.Trans.Managed (ManagedT)
|
|
|
|
import Data.Aeson
|
|
|
|
import Data.Aeson.Casing
|
|
|
|
import Data.Aeson.TH
|
|
|
|
import Data.HashMap.Strict qualified as HM
|
|
|
|
import Data.HashSet qualified as HS
|
Import `pg-client-hs` as `PG`
Result of executing the following commands:
```shell
# replace "as Q" imports with "as PG" (in retrospect this didn't need a regex)
git grep -lE 'as Q($|[^a-zA-Z])' -- '*.hs' | xargs sed -i -E 's/as Q($|[^a-zA-Z])/as PG\1/'
# replace " Q." with " PG."
git grep -lE ' Q\.' -- '*.hs' | xargs sed -i 's/ Q\./ PG./g'
# replace "(Q." with "(PG."
git grep -lE '\(Q\.' -- '*.hs' | xargs sed -i 's/(Q\./(PG./g'
# ditto, but for [, |, { and !
git grep -lE '\[Q\.' -- '*.hs' | xargs sed -i 's/\[Q\./\[PG./g'
git grep -l '|Q\.' -- '*.hs' | xargs sed -i 's/|Q\./|PG./g'
git grep -l '{Q\.' -- '*.hs' | xargs sed -i 's/{Q\./{PG./g'
git grep -l '!Q\.' -- '*.hs' | xargs sed -i 's/!Q\./!PG./g'
```
(Doing the `grep -l` before the `sed`, instead of `sed` on the entire codebase, reduces the number of `mtime` updates, and so reduces how many times a file gets recompiled while checking intermediate results.)
Finally, I manually removed a broken and unused `Arbitrary` instance in `Hasura.RQL.Network`. (It used an `import Test.QuickCheck.Arbitrary as Q` statement, which was erroneously caught by the first find-replace command.)
After this PR, `Q` is no longer used as an import qualifier. That was not the goal of this PR, but perhaps it's a useful fact for future efforts.
PR-URL: https://github.com/hasura/graphql-engine-mono/pull/5933
GitOrigin-RevId: 8c84c59d57789111d40f5d3322c5a885dcfbf40e
2022-09-20 22:54:43 +03:00
|
|
|
import Database.PG.Query qualified as PG
|
2021-05-11 18:18:31 +03:00
|
|
|
import Hasura.Base.Error
|
2019-03-12 08:46:27 +03:00
|
|
|
import Hasura.Logging
|
2020-12-14 07:30:19 +03:00
|
|
|
import Hasura.Metadata.Class
|
2021-05-11 18:18:31 +03:00
|
|
|
import Hasura.Prelude
|
2021-04-06 06:25:02 +03:00
|
|
|
import Hasura.RQL.DDL.Schema (runCacheRWT)
|
|
|
|
import Hasura.RQL.DDL.Schema.Catalog
|
2019-12-09 01:17:39 +03:00
|
|
|
import Hasura.RQL.Types.Run
|
2022-04-27 16:57:28 +03:00
|
|
|
import Hasura.RQL.Types.SchemaCache
|
|
|
|
import Hasura.RQL.Types.SchemaCache.Build
|
|
|
|
import Hasura.RQL.Types.Source
|
2022-09-14 15:59:37 +03:00
|
|
|
import Hasura.SQL.Backend (BackendType (..))
|
|
|
|
import Hasura.SQL.BackendMap qualified as BackendMap
|
2019-03-12 08:46:27 +03:00
|
|
|
import Hasura.Server.Logging
|
2022-03-09 01:59:28 +03:00
|
|
|
import Hasura.Server.SchemaCacheRef
|
|
|
|
( SchemaCacheRef,
|
|
|
|
readSchemaCacheRef,
|
|
|
|
withSchemaCacheUpdate,
|
|
|
|
)
|
2022-04-22 17:50:01 +03:00
|
|
|
import Hasura.Server.Types
|
2020-10-27 16:53:49 +03:00
|
|
|
import Hasura.Session
|
2021-05-11 18:18:31 +03:00
|
|
|
import Network.HTTP.Client qualified as HTTP
|
2022-09-21 21:01:48 +03:00
|
|
|
import Refined (NonNegative, Refined, unrefine)
|
2019-03-12 08:46:27 +03:00
|
|
|
|
|
|
|
data ThreadError
|
2020-12-14 07:30:19 +03:00
|
|
|
= TEPayloadParse !Text
|
2019-03-12 08:46:27 +03:00
|
|
|
| TEQueryError !QErr
|
2021-09-24 01:56:37 +03:00
|
|
|
|
2019-03-12 08:46:27 +03:00
|
|
|
$( deriveToJSON
|
|
|
|
defaultOptions
|
|
|
|
{ constructorTagModifier = snakeCase . drop 2,
|
|
|
|
sumEncoding = TaggedObject "type" "info"
|
|
|
|
}
|
|
|
|
''ThreadError
|
|
|
|
)
|
2021-09-24 01:56:37 +03:00
|
|
|
|
2020-11-24 09:10:04 +03:00
|
|
|
logThreadStarted ::
|
2019-11-26 15:14:21 +03:00
|
|
|
(MonadIO m) =>
|
2020-11-24 09:10:04 +03:00
|
|
|
Logger Hasura ->
|
|
|
|
InstanceId ->
|
2022-11-06 01:37:04 +03:00
|
|
|
SchemaSyncThreadType ->
|
2020-11-24 09:10:04 +03:00
|
|
|
Immortal.Thread ->
|
|
|
|
m ()
|
|
|
|
logThreadStarted logger instanceId threadType thread =
|
2020-12-08 17:22:31 +03:00
|
|
|
let msg = tshow threadType <> " thread started"
|
2020-11-24 09:10:04 +03:00
|
|
|
in unLogger logger $
|
|
|
|
StartupLog LevelInfo "schema-sync" $
|
|
|
|
object
|
|
|
|
[ "instance_id" .= getInstanceId instanceId,
|
|
|
|
"thread_id" .= show (Immortal.threadId thread),
|
|
|
|
"message" .= msg
|
|
|
|
]
|
|
|
|
|
|
|
|
{- Note [Schema Cache Sync]
|
|
|
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
|
|
|
|
|
|
When multiple graphql-engine instances are serving on same metadata storage,
|
|
|
|
each instance should have schema cache in sync with latest metadata. Somehow
|
|
|
|
all instances should communicate each other when any request has modified metadata.
|
|
|
|
|
2021-04-06 06:25:02 +03:00
|
|
|
We track the metadata schema version in postgres and poll for this
|
|
|
|
value in a thread. When the schema version has changed, the instance
|
|
|
|
will update its local metadata schema and remove any invalidated schema cache data.
|
2020-11-24 09:10:04 +03:00
|
|
|
|
2021-04-06 06:25:02 +03:00
|
|
|
The following steps take place when an API request made to update metadata:
|
2020-11-24 09:10:04 +03:00
|
|
|
|
2021-04-06 06:25:02 +03:00
|
|
|
1. After handling the request we insert the new metadata schema json
|
|
|
|
into a postgres tablealong with a schema version.
|
|
|
|
|
|
|
|
2. On start up, before initialising schema cache, an async thread is
|
|
|
|
invoked to continuously poll the Postgres notifications table for
|
|
|
|
the latest metadata schema version. The schema version is pushed to
|
|
|
|
a shared `TMVar`.
|
|
|
|
|
|
|
|
3. Before starting API server, another async thread is invoked to
|
|
|
|
process events pushed by the listener thread via the `TMVar`. If
|
|
|
|
the instance's schema version is not current with the freshly
|
|
|
|
updated TMVar version then we update the local metadata.
|
2020-11-24 09:10:04 +03:00
|
|
|
|
|
|
|
Why we need two threads if we can capture and reload schema cache in a single thread?
|
|
|
|
|
|
|
|
If we want to implement schema sync in a single async thread we have to invoke the same
|
|
|
|
after initialising schema cache. We may loose events that published after schema cache
|
|
|
|
init and before invoking the thread. In such case, schema cache is not in sync with metadata.
|
|
|
|
So we choose two threads in which one will start listening before schema cache init and the
|
|
|
|
other after it.
|
|
|
|
|
|
|
|
What happens if listen connection to Postgres is lost?
|
|
|
|
|
|
|
|
Listener thread will keep trying to establish connection to Postgres for every one second.
|
|
|
|
Once connection established, it pushes @'SSEListenStart' event with time. We aren't sure
|
|
|
|
about any metadata modify requests made in meanwhile. So we reload schema cache unconditionally
|
|
|
|
if listen started after schema cache init start time.
|
|
|
|
|
|
|
|
-}
|
|
|
|
|
|
|
|
-- | An async thread which listen to Postgres notify to enable schema syncing
|
|
|
|
-- See Note [Schema Cache Sync]
|
|
|
|
startSchemaSyncListenerThread ::
|
2020-12-21 21:56:00 +03:00
|
|
|
C.ForkableMonadIO m =>
|
2021-04-06 06:25:02 +03:00
|
|
|
Logger Hasura ->
|
Import `pg-client-hs` as `PG`
Result of executing the following commands:
```shell
# replace "as Q" imports with "as PG" (in retrospect this didn't need a regex)
git grep -lE 'as Q($|[^a-zA-Z])' -- '*.hs' | xargs sed -i -E 's/as Q($|[^a-zA-Z])/as PG\1/'
# replace " Q." with " PG."
git grep -lE ' Q\.' -- '*.hs' | xargs sed -i 's/ Q\./ PG./g'
# replace "(Q." with "(PG."
git grep -lE '\(Q\.' -- '*.hs' | xargs sed -i 's/(Q\./(PG./g'
# ditto, but for [, |, { and !
git grep -lE '\[Q\.' -- '*.hs' | xargs sed -i 's/\[Q\./\[PG./g'
git grep -l '|Q\.' -- '*.hs' | xargs sed -i 's/|Q\./|PG./g'
git grep -l '{Q\.' -- '*.hs' | xargs sed -i 's/{Q\./{PG./g'
git grep -l '!Q\.' -- '*.hs' | xargs sed -i 's/!Q\./!PG./g'
```
(Doing the `grep -l` before the `sed`, instead of `sed` on the entire codebase, reduces the number of `mtime` updates, and so reduces how many times a file gets recompiled while checking intermediate results.)
Finally, I manually removed a broken and unused `Arbitrary` instance in `Hasura.RQL.Network`. (It used an `import Test.QuickCheck.Arbitrary as Q` statement, which was erroneously caught by the first find-replace command.)
After this PR, `Q` is no longer used as an import qualifier. That was not the goal of this PR, but perhaps it's a useful fact for future efforts.
PR-URL: https://github.com/hasura/graphql-engine-mono/pull/5933
GitOrigin-RevId: 8c84c59d57789111d40f5d3322c5a885dcfbf40e
2022-09-20 22:54:43 +03:00
|
|
|
PG.PGPool ->
|
2019-03-12 08:46:27 +03:00
|
|
|
InstanceId ->
|
2022-09-21 21:01:48 +03:00
|
|
|
Refined NonNegative Milliseconds ->
|
2021-04-06 06:25:02 +03:00
|
|
|
STM.TMVar MetadataResourceVersion ->
|
|
|
|
ManagedT m (Immortal.Thread)
|
2021-04-07 12:59:48 +03:00
|
|
|
startSchemaSyncListenerThread logger pool instanceId interval metaVersionRef = do
|
2019-03-12 08:46:27 +03:00
|
|
|
-- Start listener thread
|
2021-05-14 12:38:37 +03:00
|
|
|
listenerThread <-
|
|
|
|
C.forkManagedT "SchemeUpdate.listener" logger $
|
2022-09-21 21:01:48 +03:00
|
|
|
listener logger pool metaVersionRef (unrefine interval)
|
2020-11-24 09:10:04 +03:00
|
|
|
logThreadStarted logger instanceId TTListener listenerThread
|
2021-04-06 06:25:02 +03:00
|
|
|
pure listenerThread
|
2019-03-12 08:46:27 +03:00
|
|
|
|
2020-11-24 09:10:04 +03:00
|
|
|
-- | An async thread which processes the schema sync events
|
|
|
|
-- See Note [Schema Cache Sync]
|
2021-02-18 19:46:14 +03:00
|
|
|
startSchemaSyncProcessorThread ::
|
2020-12-28 15:56:00 +03:00
|
|
|
( C.ForkableMonadIO m,
|
|
|
|
MonadMetadataStorage (MetadataStorageT m),
|
|
|
|
MonadResolveSource m
|
2021-09-24 01:56:37 +03:00
|
|
|
) =>
|
2021-04-06 06:25:02 +03:00
|
|
|
Logger Hasura ->
|
2019-03-12 08:46:27 +03:00
|
|
|
HTTP.Manager ->
|
2021-04-06 06:25:02 +03:00
|
|
|
STM.TMVar MetadataResourceVersion ->
|
2019-03-12 08:46:27 +03:00
|
|
|
SchemaCacheRef ->
|
|
|
|
InstanceId ->
|
2021-02-18 19:46:14 +03:00
|
|
|
ServerConfigCtx ->
|
2021-07-27 08:41:16 +03:00
|
|
|
STM.TVar Bool ->
|
2020-12-21 21:56:00 +03:00
|
|
|
ManagedT m Immortal.Thread
|
2020-11-24 09:10:04 +03:00
|
|
|
startSchemaSyncProcessorThread
|
2021-02-18 19:46:14 +03:00
|
|
|
logger
|
|
|
|
httpMgr
|
2021-07-27 08:41:16 +03:00
|
|
|
schemaSyncEventRef
|
|
|
|
cacheRef
|
|
|
|
instanceId
|
|
|
|
serverConfigCtx
|
|
|
|
logTVar = do
|
2020-11-24 09:10:04 +03:00
|
|
|
-- Start processor thread
|
2020-12-21 21:56:00 +03:00
|
|
|
processorThread <-
|
|
|
|
C.forkManagedT "SchemeUpdate.processor" logger $
|
2021-07-27 08:41:16 +03:00
|
|
|
processor logger httpMgr schemaSyncEventRef cacheRef instanceId serverConfigCtx logTVar
|
2020-11-24 09:10:04 +03:00
|
|
|
logThreadStarted logger instanceId TTProcessor processorThread
|
|
|
|
pure processorThread
|
|
|
|
|
2021-04-06 06:25:02 +03:00
|
|
|
-- TODO: This is also defined in multitenant, consider putting it in a library somewhere
|
|
|
|
forcePut :: STM.TMVar a -> a -> IO ()
|
|
|
|
forcePut v a = STM.atomically $ STM.tryTakeTMVar v >> STM.putTMVar v a
|
|
|
|
|
|
|
|
schemaVersionCheckHandler ::
|
Import `pg-client-hs` as `PG`
Result of executing the following commands:
```shell
# replace "as Q" imports with "as PG" (in retrospect this didn't need a regex)
git grep -lE 'as Q($|[^a-zA-Z])' -- '*.hs' | xargs sed -i -E 's/as Q($|[^a-zA-Z])/as PG\1/'
# replace " Q." with " PG."
git grep -lE ' Q\.' -- '*.hs' | xargs sed -i 's/ Q\./ PG./g'
# replace "(Q." with "(PG."
git grep -lE '\(Q\.' -- '*.hs' | xargs sed -i 's/(Q\./(PG./g'
# ditto, but for [, |, { and !
git grep -lE '\[Q\.' -- '*.hs' | xargs sed -i 's/\[Q\./\[PG./g'
git grep -l '|Q\.' -- '*.hs' | xargs sed -i 's/|Q\./|PG./g'
git grep -l '{Q\.' -- '*.hs' | xargs sed -i 's/{Q\./{PG./g'
git grep -l '!Q\.' -- '*.hs' | xargs sed -i 's/!Q\./!PG./g'
```
(Doing the `grep -l` before the `sed`, instead of `sed` on the entire codebase, reduces the number of `mtime` updates, and so reduces how many times a file gets recompiled while checking intermediate results.)
Finally, I manually removed a broken and unused `Arbitrary` instance in `Hasura.RQL.Network`. (It used an `import Test.QuickCheck.Arbitrary as Q` statement, which was erroneously caught by the first find-replace command.)
After this PR, `Q` is no longer used as an import qualifier. That was not the goal of this PR, but perhaps it's a useful fact for future efforts.
PR-URL: https://github.com/hasura/graphql-engine-mono/pull/5933
GitOrigin-RevId: 8c84c59d57789111d40f5d3322c5a885dcfbf40e
2022-09-20 22:54:43 +03:00
|
|
|
PG.PGPool -> STM.TMVar MetadataResourceVersion -> IO (Either QErr ())
|
2021-04-06 06:25:02 +03:00
|
|
|
schemaVersionCheckHandler pool metaVersionRef =
|
2021-06-08 15:55:18 +03:00
|
|
|
runExceptT
|
Import `pg-client-hs` as `PG`
Result of executing the following commands:
```shell
# replace "as Q" imports with "as PG" (in retrospect this didn't need a regex)
git grep -lE 'as Q($|[^a-zA-Z])' -- '*.hs' | xargs sed -i -E 's/as Q($|[^a-zA-Z])/as PG\1/'
# replace " Q." with " PG."
git grep -lE ' Q\.' -- '*.hs' | xargs sed -i 's/ Q\./ PG./g'
# replace "(Q." with "(PG."
git grep -lE '\(Q\.' -- '*.hs' | xargs sed -i 's/(Q\./(PG./g'
# ditto, but for [, |, { and !
git grep -lE '\[Q\.' -- '*.hs' | xargs sed -i 's/\[Q\./\[PG./g'
git grep -l '|Q\.' -- '*.hs' | xargs sed -i 's/|Q\./|PG./g'
git grep -l '{Q\.' -- '*.hs' | xargs sed -i 's/{Q\./{PG./g'
git grep -l '!Q\.' -- '*.hs' | xargs sed -i 's/!Q\./!PG./g'
```
(Doing the `grep -l` before the `sed`, instead of `sed` on the entire codebase, reduces the number of `mtime` updates, and so reduces how many times a file gets recompiled while checking intermediate results.)
Finally, I manually removed a broken and unused `Arbitrary` instance in `Hasura.RQL.Network`. (It used an `import Test.QuickCheck.Arbitrary as Q` statement, which was erroneously caught by the first find-replace command.)
After this PR, `Q` is no longer used as an import qualifier. That was not the goal of this PR, but perhaps it's a useful fact for future efforts.
PR-URL: https://github.com/hasura/graphql-engine-mono/pull/5933
GitOrigin-RevId: 8c84c59d57789111d40f5d3322c5a885dcfbf40e
2022-09-20 22:54:43 +03:00
|
|
|
( PG.runTx pool (PG.RepeatableRead, Nothing) $
|
2021-07-27 08:41:16 +03:00
|
|
|
fetchMetadataResourceVersionFromCatalog
|
|
|
|
)
|
|
|
|
>>= \case
|
|
|
|
Right version -> Right <$> forcePut metaVersionRef version
|
|
|
|
Left err -> pure $ Left err
|
2021-06-08 15:55:18 +03:00
|
|
|
|
2021-07-27 08:41:16 +03:00
|
|
|
data ErrorState = ErrorState
|
|
|
|
{ _esLastErrorSeen :: !(Maybe QErr),
|
|
|
|
_esLastMetadataVersion :: !(Maybe MetadataResourceVersion)
|
|
|
|
}
|
2022-07-01 14:47:20 +03:00
|
|
|
deriving (Eq)
|
2021-06-08 15:55:18 +03:00
|
|
|
|
|
|
|
-- NOTE: The ErrorState type is to be used mainly for the `listener` method below.
|
|
|
|
-- This will help prevent logging the same error with the same MetadataResourceVersion
|
|
|
|
-- multiple times consecutively. When the `listener` is in ErrorState we don't log the
|
|
|
|
-- next error until the resource version has changed/updated.
|
|
|
|
|
2021-07-27 08:41:16 +03:00
|
|
|
defaultErrorState :: ErrorState
|
|
|
|
defaultErrorState = ErrorState Nothing Nothing
|
2021-06-08 15:55:18 +03:00
|
|
|
|
|
|
|
-- | NOTE: this can be updated to use lenses
|
2021-07-27 08:41:16 +03:00
|
|
|
updateErrorInState :: ErrorState -> QErr -> MetadataResourceVersion -> ErrorState
|
|
|
|
updateErrorInState es qerr mrv =
|
|
|
|
es
|
|
|
|
{ _esLastErrorSeen = Just qerr,
|
|
|
|
_esLastMetadataVersion = Just mrv
|
|
|
|
}
|
2021-06-08 15:55:18 +03:00
|
|
|
|
|
|
|
isInErrorState :: ErrorState -> Bool
|
2021-07-27 08:41:16 +03:00
|
|
|
isInErrorState es =
|
|
|
|
(isJust . _esLastErrorSeen) es && (isJust . _esLastMetadataVersion) es
|
2021-06-08 15:55:18 +03:00
|
|
|
|
2021-07-27 08:41:16 +03:00
|
|
|
toLogError :: ErrorState -> QErr -> MetadataResourceVersion -> Bool
|
|
|
|
toLogError es qerr mrv = not $ isQErrLastSeen || isMetadataResourceVersionLastSeen
|
|
|
|
where
|
|
|
|
isQErrLastSeen = case _esLastErrorSeen es of
|
|
|
|
Just lErrS -> lErrS == qerr
|
|
|
|
Nothing -> False
|
|
|
|
|
|
|
|
isMetadataResourceVersionLastSeen = case _esLastMetadataVersion es of
|
|
|
|
Just lMRV -> lMRV == mrv
|
|
|
|
Nothing -> False
|
2021-04-06 06:25:02 +03:00
|
|
|
|
2020-11-24 09:10:04 +03:00
|
|
|
-- | An IO action that listens to postgres for events and pushes them to a Queue, in a loop forever.
|
|
|
|
listener ::
|
2021-04-06 06:25:02 +03:00
|
|
|
MonadIO m =>
|
|
|
|
Logger Hasura ->
|
Import `pg-client-hs` as `PG`
Result of executing the following commands:
```shell
# replace "as Q" imports with "as PG" (in retrospect this didn't need a regex)
git grep -lE 'as Q($|[^a-zA-Z])' -- '*.hs' | xargs sed -i -E 's/as Q($|[^a-zA-Z])/as PG\1/'
# replace " Q." with " PG."
git grep -lE ' Q\.' -- '*.hs' | xargs sed -i 's/ Q\./ PG./g'
# replace "(Q." with "(PG."
git grep -lE '\(Q\.' -- '*.hs' | xargs sed -i 's/(Q\./(PG./g'
# ditto, but for [, |, { and !
git grep -lE '\[Q\.' -- '*.hs' | xargs sed -i 's/\[Q\./\[PG./g'
git grep -l '|Q\.' -- '*.hs' | xargs sed -i 's/|Q\./|PG./g'
git grep -l '{Q\.' -- '*.hs' | xargs sed -i 's/{Q\./{PG./g'
git grep -l '!Q\.' -- '*.hs' | xargs sed -i 's/!Q\./!PG./g'
```
(Doing the `grep -l` before the `sed`, instead of `sed` on the entire codebase, reduces the number of `mtime` updates, and so reduces how many times a file gets recompiled while checking intermediate results.)
Finally, I manually removed a broken and unused `Arbitrary` instance in `Hasura.RQL.Network`. (It used an `import Test.QuickCheck.Arbitrary as Q` statement, which was erroneously caught by the first find-replace command.)
After this PR, `Q` is no longer used as an import qualifier. That was not the goal of this PR, but perhaps it's a useful fact for future efforts.
PR-URL: https://github.com/hasura/graphql-engine-mono/pull/5933
GitOrigin-RevId: 8c84c59d57789111d40f5d3322c5a885dcfbf40e
2022-09-20 22:54:43 +03:00
|
|
|
PG.PGPool ->
|
2021-04-06 06:25:02 +03:00
|
|
|
STM.TMVar MetadataResourceVersion ->
|
|
|
|
Milliseconds ->
|
|
|
|
m void
|
2021-07-27 08:41:16 +03:00
|
|
|
listener logger pool metaVersionRef interval = L.iterateM_ listenerLoop defaultErrorState
|
2021-06-08 15:55:18 +03:00
|
|
|
where
|
|
|
|
listenerLoop errorState = do
|
|
|
|
mrv <- liftIO $ STM.atomically $ STM.tryTakeTMVar metaVersionRef
|
|
|
|
resp <- liftIO $ schemaVersionCheckHandler pool metaVersionRef
|
|
|
|
let metadataVersion = fromMaybe initialResourceVersion mrv
|
|
|
|
nextErr <- case resp of
|
|
|
|
Left respErr -> do
|
2021-07-27 08:41:16 +03:00
|
|
|
if (toLogError errorState respErr metadataVersion)
|
2021-06-08 15:55:18 +03:00
|
|
|
then do
|
|
|
|
logError logger TTListener $ TEQueryError respErr
|
|
|
|
logInfo logger TTListener $ object ["metadataResourceVersion" .= toJSON metadataVersion]
|
2021-07-27 08:41:16 +03:00
|
|
|
pure $ updateErrorInState errorState respErr metadataVersion
|
2021-06-08 15:55:18 +03:00
|
|
|
else do
|
|
|
|
pure errorState
|
|
|
|
Right _ -> do
|
|
|
|
when (isInErrorState errorState) $
|
|
|
|
logInfo logger TTListener $
|
|
|
|
object ["message" .= ("SchemaSync Restored..." :: Text)]
|
2021-07-27 08:41:16 +03:00
|
|
|
pure defaultErrorState
|
2021-06-08 15:55:18 +03:00
|
|
|
liftIO $ C.sleep $ milliseconds interval
|
|
|
|
pure nextErr
|
2019-03-12 08:46:27 +03:00
|
|
|
|
2020-03-05 20:59:26 +03:00
|
|
|
-- | An IO action that processes events from Queue, in a loop forever.
|
2021-04-06 06:25:02 +03:00
|
|
|
processor ::
|
2020-12-14 07:30:19 +03:00
|
|
|
forall m void.
|
|
|
|
( C.ForkableMonadIO m,
|
|
|
|
MonadMetadataStorage (MetadataStorageT m),
|
2021-04-06 06:25:02 +03:00
|
|
|
MonadResolveSource m
|
2021-09-24 01:56:37 +03:00
|
|
|
) =>
|
2021-04-06 06:25:02 +03:00
|
|
|
Logger Hasura ->
|
2019-03-12 08:46:27 +03:00
|
|
|
HTTP.Manager ->
|
2021-04-06 06:25:02 +03:00
|
|
|
STM.TMVar MetadataResourceVersion ->
|
2019-03-12 08:46:27 +03:00
|
|
|
SchemaCacheRef ->
|
2021-04-06 06:25:02 +03:00
|
|
|
InstanceId ->
|
2021-02-18 19:46:14 +03:00
|
|
|
ServerConfigCtx ->
|
2021-07-27 08:41:16 +03:00
|
|
|
STM.TVar Bool ->
|
2021-09-24 01:56:37 +03:00
|
|
|
m void
|
2019-03-12 08:46:27 +03:00
|
|
|
processor
|
2021-02-18 19:46:14 +03:00
|
|
|
logger
|
2019-03-12 08:46:27 +03:00
|
|
|
httpMgr
|
2021-04-06 06:25:02 +03:00
|
|
|
metaVersionRef
|
2019-03-12 08:46:27 +03:00
|
|
|
cacheRef
|
2020-11-24 09:10:04 +03:00
|
|
|
instanceId
|
2021-02-18 19:46:14 +03:00
|
|
|
serverConfigCtx
|
2021-07-27 08:41:16 +03:00
|
|
|
logTVar = forever $ do
|
2021-04-06 06:25:02 +03:00
|
|
|
metaVersion <- liftIO $ STM.atomically $ STM.takeTMVar metaVersionRef
|
|
|
|
respErr <-
|
|
|
|
runMetadataStorageT $
|
2021-07-27 08:41:16 +03:00
|
|
|
refreshSchemaCache metaVersion instanceId logger httpMgr cacheRef TTProcessor serverConfigCtx logTVar
|
2021-04-06 06:25:02 +03:00
|
|
|
onLeft respErr (logError logger TTProcessor . TEQueryError)
|
2021-09-24 01:56:37 +03:00
|
|
|
|
2021-04-06 06:25:02 +03:00
|
|
|
refreshSchemaCache ::
|
2020-12-14 07:30:19 +03:00
|
|
|
( MonadIO m,
|
2021-04-06 06:25:02 +03:00
|
|
|
MonadBaseControl IO m,
|
|
|
|
MonadMetadataStorage m,
|
|
|
|
MonadResolveSource m
|
2021-09-24 01:56:37 +03:00
|
|
|
) =>
|
2021-07-27 08:41:16 +03:00
|
|
|
MetadataResourceVersion ->
|
2021-04-06 06:25:02 +03:00
|
|
|
InstanceId ->
|
2020-12-14 07:30:19 +03:00
|
|
|
Logger Hasura ->
|
2019-03-12 08:46:27 +03:00
|
|
|
HTTP.Manager ->
|
|
|
|
SchemaCacheRef ->
|
2022-11-06 01:37:04 +03:00
|
|
|
SchemaSyncThreadType ->
|
2021-02-18 19:46:14 +03:00
|
|
|
ServerConfigCtx ->
|
2021-07-27 08:41:16 +03:00
|
|
|
STM.TVar Bool ->
|
2021-09-24 01:56:37 +03:00
|
|
|
m ()
|
2019-03-12 08:46:27 +03:00
|
|
|
refreshSchemaCache
|
2021-04-06 06:25:02 +03:00
|
|
|
resourceVersion
|
|
|
|
instanceId
|
|
|
|
logger
|
2019-03-12 08:46:27 +03:00
|
|
|
httpManager
|
|
|
|
cacheRef
|
|
|
|
threadType
|
2021-02-18 19:46:14 +03:00
|
|
|
serverConfigCtx
|
2021-07-27 08:41:16 +03:00
|
|
|
logTVar = do
|
|
|
|
respErr <- runExceptT $
|
2022-03-09 01:59:28 +03:00
|
|
|
withSchemaCacheUpdate cacheRef logger (Just logTVar) $ do
|
|
|
|
rebuildableCache <- liftIO $ fst <$> readSchemaCacheRef cacheRef
|
2021-04-06 06:25:02 +03:00
|
|
|
(msg, cache, _) <- peelRun runCtx $
|
|
|
|
runCacheRWT rebuildableCache $ do
|
|
|
|
schemaCache <- askSchemaCache
|
2022-02-09 08:13:32 +03:00
|
|
|
case scMetadataResourceVersion schemaCache of
|
|
|
|
-- While starting up, the metadata resource version is set to nothing, so we want to set the version
|
|
|
|
-- without fetching the database metadata (as we have already fetched it during the startup, so, we
|
|
|
|
-- skip fetching it twice)
|
2022-11-03 02:22:58 +03:00
|
|
|
Nothing -> do
|
|
|
|
setMetadataResourceVersionInSchemaCache resourceVersion
|
|
|
|
logInfo logger threadType $
|
|
|
|
String $
|
|
|
|
"Received metadata resource version "
|
|
|
|
<> tshow resourceVersion
|
|
|
|
<> " as an initial version. Not updating the schema cache."
|
2022-02-09 08:13:32 +03:00
|
|
|
Just engineResourceVersion ->
|
2022-11-04 22:40:42 +03:00
|
|
|
unless (engineResourceVersion == resourceVersion) $ do
|
|
|
|
logInfo logger threadType $
|
|
|
|
String $
|
|
|
|
"Received metadata resource version "
|
|
|
|
<> tshow resourceVersion
|
|
|
|
<> ", different from the current engine resource version"
|
|
|
|
<> tshow engineResourceVersion
|
|
|
|
<> "."
|
|
|
|
|
|
|
|
(metadata, latestResourceVersion) <- fetchMetadata
|
|
|
|
logInfo logger threadType $
|
|
|
|
String $
|
|
|
|
"Fetched metadata with resource version "
|
|
|
|
<> tshow latestResourceVersion
|
|
|
|
|
|
|
|
notifications <- fetchMetadataNotifications engineResourceVersion instanceId
|
|
|
|
|
|
|
|
case notifications of
|
|
|
|
[] -> do
|
|
|
|
logInfo logger threadType $
|
|
|
|
String $
|
|
|
|
"Fetched metadata notifications and received no notifications. Not updating the schema cache."
|
|
|
|
setMetadataResourceVersionInSchemaCache latestResourceVersion
|
|
|
|
_ -> do
|
|
|
|
logInfo logger threadType $
|
|
|
|
String $
|
|
|
|
"Fetched metadata notifications and received some notifications. Updating the schema cache."
|
|
|
|
let cacheInvalidations =
|
|
|
|
if any ((== (engineResourceVersion + 1)) . fst) notifications
|
|
|
|
then -- If (engineResourceVersion + 1) is in the list of notifications then
|
|
|
|
-- we know that we haven't missed any.
|
|
|
|
mconcat $ snd <$> notifications
|
|
|
|
else -- Otherwise we may have missed some notifications so we need to invalidate the
|
|
|
|
-- whole cache.
|
|
|
|
|
|
|
|
CacheInvalidations
|
|
|
|
{ ciMetadata = True,
|
|
|
|
ciRemoteSchemas = HS.fromList $ getAllRemoteSchemas schemaCache,
|
|
|
|
ciSources = HS.fromList $ HM.keys $ scSources schemaCache,
|
|
|
|
ciDataConnectors =
|
|
|
|
maybe mempty (HS.fromList . HM.keys . unBackendInfoWrapper) $
|
|
|
|
BackendMap.lookup @'DataConnector $
|
|
|
|
scBackendCache schemaCache
|
|
|
|
}
|
|
|
|
logInfo logger threadType $ object ["currentVersion" .= engineResourceVersion, "latestResourceVersion" .= latestResourceVersion]
|
|
|
|
buildSchemaCacheWithOptions CatalogSync cacheInvalidations metadata
|
|
|
|
setMetadataResourceVersionInSchemaCache latestResourceVersion
|
|
|
|
logInfo logger threadType $ object ["message" .= ("Schema Version changed with notifications" :: Text)]
|
2021-04-06 06:25:02 +03:00
|
|
|
pure (msg, cache)
|
|
|
|
onLeft respErr (logError logger threadType . TEQueryError)
|
2019-10-11 08:13:57 +03:00
|
|
|
where
|
2021-01-29 08:48:17 +03:00
|
|
|
runCtx = RunCtx adminUserInfo httpManager serverConfigCtx
|
2019-03-12 08:46:27 +03:00
|
|
|
|
2022-11-06 01:37:04 +03:00
|
|
|
logInfo :: (MonadIO m) => Logger Hasura -> SchemaSyncThreadType -> Value -> m ()
|
2019-03-12 08:46:27 +03:00
|
|
|
logInfo logger threadType val =
|
|
|
|
unLogger logger $
|
2022-11-06 01:37:04 +03:00
|
|
|
SchemaSyncLog LevelInfo threadType val
|
2019-03-12 08:46:27 +03:00
|
|
|
|
2022-11-06 01:37:04 +03:00
|
|
|
logError :: (MonadIO m, ToJSON a) => Logger Hasura -> SchemaSyncThreadType -> a -> m ()
|
2019-03-12 08:46:27 +03:00
|
|
|
logError logger threadType err =
|
|
|
|
unLogger logger $
|
2022-11-06 01:37:04 +03:00
|
|
|
SchemaSyncLog LevelError threadType $
|
2019-03-12 08:46:27 +03:00
|
|
|
object ["error" .= toJSON err]
|
2021-04-06 06:25:02 +03:00
|
|
|
|
2022-11-03 02:22:58 +03:00
|
|
|
-- Currently unused
|
2022-11-06 01:37:04 +03:00
|
|
|
_logDebug :: (MonadIO m) => Logger Hasura -> SchemaSyncThreadType -> String -> m ()
|
2022-11-03 02:22:58 +03:00
|
|
|
_logDebug logger threadType msg =
|
2021-04-06 06:25:02 +03:00
|
|
|
unLogger logger $
|
2022-11-06 01:37:04 +03:00
|
|
|
SchemaSyncLog LevelDebug threadType $
|
2021-04-06 06:25:02 +03:00
|
|
|
object ["message" .= msg]
|